X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fsys;h=6ae736dc2927713cbfa6fc0d064b30ffbe1e6b77;hb=e2f2e629cc8528e6fba430398c5e46d64734245e;hp=a83baaafbcaaf1170c5c71fd20794a2efa890e9f;hpb=db0d7b6059d4056612b0ff84e196b92b7cf84120;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/sys b/handlers/sys
index a83baaa..6ae736d 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -37,18 +37,19 @@ if [ $os = "debian" ]
 then
    getconf packagesfile /var/backups/dpkg-selections.txt
    getconf packagemgr   `which dpkg`
-   getconf packagemgroptions " --get-selections"
+   getconf packagemgroptions ' --get-selections *'
 elif [ $os = "redhat" ]
 then
    getconf packagesfile  /var/backups/rpmpackages.txt 
    getconf packagemgr	`which rpm`
-   getconf packagemgroptions	" -qa "
+   getconf packagemgroptions	' -qa '
 
    getconf SYSREPORT `which sysreport`
-   getconf sysreport_options " -norpm "
+   getconf sysreport_options ' -norpm '
 else
    getconf packagesfile /var/backups/unknownOS.txt
 fi
+packagemgroptions="${packagemgroptions//__star__/*}"
 
 getconf partitions yes
 getconf partitionsfile /var/backups/partitions.__star__.txt
@@ -93,7 +94,6 @@ if [ "$packages" == "yes" ]; then
                               nodpkg="$nodpkg|$vserver"
                            fi
 			else
-                           warning "vserver $vserver is not running, skipping installed packages report."
                            nodpkg="$nodpkg|$vserver"
 			fi
 
@@ -111,15 +111,21 @@ if [ "$packages" == "yes" ]; then
    then
       for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
       do
+         # don't expand * since it can be used in $packagemgroptions
+         set -o noglob
 	 debug "$VSERVER $vserver exec $packagemgr $packagemgroptions > $VROOTDIR/$vserver$packagesfile"
 	 $VSERVER $vserver exec $packagemgr $packagemgroptions > $VROOTDIR/$vserver$packagesfile || fatal "can not save $packagemgr info to $packagesfile"
+         set +o noglob
       done
    fi
    
 # We want to perform this on the host as well
    if [ "$packages" == "yes" ]; then
+      # don't expand * since it can be used in $packagemgroptions
+      set -o noglob
       debug "$packagemgr $packagemgroptions > $packagesfile"
       $packagemgr $packagemgroptions > $packagesfile || fatal "can not save $packagemgr info to $packagesfile"
+      set +o noglob
    fi
 fi
 
@@ -285,7 +291,7 @@ catiffile "/proc/stat"
 STATUS="Gathering information about your partitions:"
 catiffile "/proc/partitions"
 
-STATUS="Gathering information about your ksysms:"
+STATUS="Gathering information about your ksyms:"
 catiffile "/proc/ksyms"
 
 STATUS="Gathering information about slabinfo:"
@@ -449,14 +455,17 @@ fi
 # these files can be used to directly partition a disk of the same size.
 
 if [ "$partitions" == "yes" ]; then
-	devices=`$HWINFO --disk | grep "Device File" | cut -d\  -f5`
+	devices=`$SFDISK -l | grep "^Disk /dev" | cut -d/  -f2,3 | cut -d: -f1`
+	if [ "$devices" == "" ]; then 
+	   warning "No harddisks found" 
+	fi
 	for dev in $devices; do
 		[ -b $dev ] || continue
 		label=${dev#/dev/}
 		label=${label//\//-}
 		outputfile=${partitionsfile//__star__/$label}
-		debug "$SFDISK $sfdisk_options -d $dev > $outputfile"
-		$SFDISK $sfdisk_options -d $dev > $outputfile
+		debug "$SFDISK $sfdisk_options -d /$dev > $outputfile"
+		$SFDISK $sfdisk_options -d /$dev > $outputfile
 	done
 fi