X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fsys;h=3c04365722c6d8d20901391b6f6642571bf7f840;hb=7debcd465b00af6305bf796e3fedc350a204c603;hp=a83baaafbcaaf1170c5c71fd20794a2efa890e9f;hpb=db0d7b6059d4056612b0ff84e196b92b7cf84120;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/sys b/handlers/sys index a83baaa..3c04365 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 @@ -449,14 +449,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