From fd6796ad99b90371594c3068e6d8bbbdb2b1d1d5 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 24 Jun 2008 16:05:44 +0000 Subject: sys: support selection of VServers to run on with the new vsnames configuration option (Closes: Trac#45) --- handlers/sys.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'handlers/sys.in') diff --git a/handlers/sys.in b/handlers/sys.in index 0f863d7..455234d 100755 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -73,11 +73,18 @@ getconf HWINFO `which hwinfo` getconf sfdisk_options "" getconf hwinfo_options "" -# See if vservers are configured +getconf vsnames all + +# If vservers are configured, check that the ones listed in $vsnames are running. local usevserver=no -if [ $vservers_are_available = yes ] -then - info "vserver method enabled" +if [ $vservers_are_available = yes ]; then + if [ "$vsnames" = all ]; then + vsnames="$found_vservers" + fi + if ! vservers_running "$vsnames" ; then + fatal "At least one of the vservers listed in vsnames ($vsnames) is not running." + fi + info "Using vservers '$vsnames'" usevserver=yes fi @@ -91,7 +98,7 @@ if [ "$packages" == "yes" ]; then if [ $usevserver = yes ]; then info "vserver root directory set to: $VROOTDIR" - for vserver in $found_vservers; do + for vserver in $vsnames; do info "examining vserver: $vserver" # is it running ? vservers_running $vserver -- cgit v1.2.3