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