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

diff --git a/handlers/sys b/handlers/sys
index a83baaa..8059866 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -37,7 +37,7 @@ 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 
@@ -93,7 +93,6 @@ if [ "$packages" == "yes" ]; then
                               nodpkg="$nodpkg|$vserver"
                            fi
 			else
-                           warning "vserver $vserver is not running, skipping installed packages report."
                            nodpkg="$nodpkg|$vserver"
 			fi
 
@@ -449,14 +448,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