sys: fix the '*' in dpkg --get-selections

diff --git a/ChangeLog b/ChangeLog
index 72572e527342cb9dee7117b51e26dd896ab12c52..8079317d3a418327d87b7217e31766b9cb42e125 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,7 +66,8 @@ version 0.9.4 -- unreleased
        sys:
         . Many more system checks were added, (thanks to Petr Klíma)
         . Added warning if no devices were found (thanks Ranier Zocholl)
        sys:
         . Many more system checks were added, (thanks to Petr Klíma)
         . Added warning if no devices were found (thanks Ranier Zocholl)

-        . Enhanced debian package selections to include purged packages (thanks Tom Hoover)
+        . Enhanced debian package selections to include purged packages (thanks
+          Tom Hoover)

         . Removed warning about vserver not running (thanks anarcat)
        ldap:
         . Compress now happens in-line to save some disk space (Closes: #370778)
         . Removed warning about vserver not running (thanks anarcat)
        ldap:
         . Compress now happens in-line to save some disk space (Closes: #370778)

diff --git a/handlers/sys b/handlers/sys
index 8059866cea70affe63b32cbc88f9a64b44614fa4..310d921de92a9c89559469ec9b9e7f7115d9190a 100755 (executable)
--- 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`
 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`
 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 `which sysreport`

-   getconf sysreport_options " -norpm "
+   getconf sysreport_options ' -norpm '

 else
    getconf packagesfile /var/backups/unknownOS.txt
 fi
 else
    getconf packagesfile /var/backups/unknownOS.txt
 fi

+packagemgroptions="${packagemgroptions//__star__/*}"

 
 getconf partitions yes
 getconf partitionsfile /var/backups/partitions.__star__.txt
 
 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
    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"
         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
       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"
       debug "$packagemgr $packagemgroptions > $packagesfile"
       $packagemgr $packagemgroptions > $packagesfile || fatal "can not save $packagemgr info to $packagesfile"

+      set +o noglob

    fi
 fi
 
    fi
 fi