X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fsys.in;h=399a8bded5d9d089936816e24a213cd536ccff22;hp=d88d34c3d037a20580cc93f82a8c0296e40b17e0;hb=3f29d82b6c1cef7ad4a1c4ed8d14b4975dd88af3;hpb=b499255f8a56ce3b95c2a52b8b209ae8b657bd64 diff --git a/handlers/sys.in b/handlers/sys.in index d88d34c..399a8bd 100755 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -53,7 +53,7 @@ then getconf packagesfile $parentdir/dpkg-selections.txt getconf packagemgr `which dpkg` getconf packagemgroptions ' --get-selections *' - getconf selectionsfile $parentir/debconfsel.txt + getconf selectionsfile $parentdir/debconfsel.txt getconf debconfgetselections `which debconf-get-selections` elif [ $os = "redhat" ] then @@ -126,11 +126,11 @@ if [ "$packages" == "yes" ]; then set +o noglob fi # is $debconfgetselections available inside $vserver ? - if [ ! -x "$VROOTDIR/$vserver`$VSERVER $vserver exec which $debconfgetselections`" ]; then - warning "can't find $debconfgetselections in vserver $vserver, skipping package selection states." + if [ -z "`$VSERVER $vserver exec which debconf-get-selections`" ]; then + warning "can't find debconf-get-selections in vserver $vserver, skipping package selection states." else debug "$VSERVER $vserver exec $debconfgetselections > $VROOTDIR/$vserver$selectionsfile" - $VSERVER $vserver exec $debconfgetselections > $VROOTDIR/$vserver$selectionsfile || fatal "can not save $debconfgetselections info to $selectionsfile" + $VSERVER $vserver exec $debconfgetselections > $VROOTDIR/$vserver$selectionsfile || fatal "can not save debconf-get-selections info to $selectionsfile" fi done fi @@ -146,7 +146,7 @@ if [ "$packages" == "yes" ]; then set +o noglob fi if [ -z "$debconfgetselections" ]; then - warning "can't find ${debconfgetselections}, skilling package selection states." + warning "can't find ${debconfgetselections}, skipping package selection states." else debug "$debconfgetselections > $selectionsfile" $debconfgetselections > $selectionsfile || fatal "can not save $debconfgetselections info to $selectionsfile"