From 88d1f719c580ded553e95cbc125a65bf9362e5a4 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 14 Aug 2005 22:54:08 +0000 Subject: [PATCH] Fixed a critical bug in sys handler vservers support: it tried (and failed) to save packages list even if packages=no. --- handlers/sys | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/handlers/sys b/handlers/sys index 83af9b9..8054b4a 100755 --- a/handlers/sys +++ b/handlers/sys @@ -95,22 +95,23 @@ fi # here we grab a list of the packages installed and removed. # -if [ $usevserver ] -then - for vserver in `ls $VROOTDIR | grep -E -v $nodpkg` - do - debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile" - $VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile - done -fi - -# We want to perform this on the host as well if [ "$packages" == "yes" ]; then - debug "dpkg --get-selections > $packagesfile" - dpkg --get-selections > $packagesfile + if [ $usevserver ] + then + for vserver in `ls $VROOTDIR | grep -E -v $nodpkg` + do + debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile" + $VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile + done + fi + +# We want to perform this on the host as well + if [ "$packages" == "yes" ]; then + debug "dpkg --get-selections > $packagesfile" + dpkg --get-selections > $packagesfile + fi fi - ## PARTITIONS ############################# # here we use sfdisk to dump a listing of all the partitions. -- 2.30.2