X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fsys;h=84c95403686245326108947e59c87b3762e5864f;hp=8059866cea70affe63b32cbc88f9a64b44614fa4;hb=2dd5981aadc4c895f983f1ec897880fb6ea12388;hpb=4ce9c573c8533d3b2f1ec6063342fadd06356540 diff --git a/handlers/sys b/handlers/sys index 8059866..84c9540 100755 --- a/handlers/sys +++ b/handlers/sys @@ -37,18 +37,19 @@ 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 getconf packagemgr `which rpm` - getconf packagemgroptions " -qa " + getconf packagemgroptions ' -qa ' getconf SYSREPORT `which sysreport` - getconf sysreport_options " -norpm " + getconf sysreport_options ' -norpm ' else getconf packagesfile /var/backups/unknownOS.txt fi +packagemgroptions="${packagemgroptions//__star__/*}" getconf partitions yes getconf partitionsfile /var/backups/partitions.__star__.txt @@ -110,15 +111,21 @@ if [ "$packages" == "yes" ]; then then for vserver in `ls $VROOTDIR | grep -E -v $nodpkg` do + # don't expand * since it can be used in $packagemgroptions + set -o noglob debug "$VSERVER $vserver exec $packagemgr $packagemgroptions > $VROOTDIR/$vserver$packagesfile" $VSERVER $vserver exec $packagemgr $packagemgroptions > $VROOTDIR/$vserver$packagesfile || fatal "can not save $packagemgr info to $packagesfile" + set +o noglog done fi # We want to perform this on the host as well if [ "$packages" == "yes" ]; then + # don't expand * since it can be used in $packagemgroptions + set -o noglob debug "$packagemgr $packagemgroptions > $packagesfile" $packagemgr $packagemgroptions > $packagesfile || fatal "can not save $packagemgr info to $packagesfile" + set +o noglob fi fi @@ -284,7 +291,7 @@ catiffile "/proc/stat" STATUS="Gathering information about your partitions:" catiffile "/proc/partitions" -STATUS="Gathering information about your ksysms:" +STATUS="Gathering information about your ksyms:" catiffile "/proc/ksyms" STATUS="Gathering information about slabinfo:"