Added disk space report option (adam kosmin suggestion)

[matthijs/upstream/backupninja.git] / handlers / sys

diff --git a/handlers/sys b/handlers/sys
index d0e2057d50bc15fdb48368c718f2a67882fb6939..8059866cea70affe63b32cbc88f9a64b44614fa4 100755 (executable)
--- 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,7 +448,7 @@ 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
@@ -458,8 +457,8 @@ if [ "$partitions" == "yes" ]; then
                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