-# If vservers are configured, decide if the handler should
-# use them or if it should just operate on the host
-
-if [ "$vservers" = "yes" ]
-then
- if [ ! -z $vsname ]
- then
- info "Using vserver '$vsname'"
- usevserver=1
- else
- info "No vserver name specified, actions will be performed on the host"
- fi
-fi
-
-# If needed, make sure that the specified vserver exists and is running.
-if [ $usevserver ]
-then
- info "Examining vserver '$vsname'"
- # does it exist ?
- vroot="$VROOTDIR/$vsname"
- [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
- # is it running ?
- $VSERVERINFO -q $vsname RUNNING
- if [ $? -ne 0 ]
- then
- fatal "vserver $vsname is not running."
- fi
-fi
-
-if [ "$user" == "" ]; then
- userset=false;
- user=root;
-else
- userset=true;
- if [ $usevserver ]
- then
- userhome=`$VSERVER $vsname exec getent passwd "$user" | awk -F: '{print $6}'`
- if [ $? -eq 2 ]
- then
- fatal "User $user not found in /etc/passwd"
- fi
- userhome="$VROOTDIR/$vsname$userhome"
- info "User home set to: $userhome"
- [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
- else
- userhome=`getent passwd "$user" | awk -F: '{print $6}'`
- if [ $? -eq 2 ]
- then
- fatal "User $user not found in /etc/passwd"
- fi
- info "User home set to: $userhome"
- [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
- fi
+# Decide if the handler should operate on a vserver or on the host.
+# In the former case, check that $vsname exists and is running.
+local usevserver=no
+local vroot
+if [ $vservers_are_available = yes ]; then
+ if [ -n "$vsname" ]; then
+ # does it exist ?
+ if ! vservers_exist "$vsname" ; then
+ fatal "The vserver given in vsname ($vsname) does not exist."
+ fi
+ # is it running ?
+ $VSERVERINFO -q $vsname RUNNING
+ if [ $? -ne 0 ]; then
+ fatal "The vserver $vsname is not running."
+ fi
+ # everything ok
+ info "Using vserver '$vsname'."
+ usevserver=yes
+ vroot="$VROOTDIR/$vsname"
+ else
+ info "No vserver name specified, actions will be performed on the host."
+ fi