getconf VSERVERINFO /usr/sbin/vserver-info
getconf VSERVER /usr/sbin/vserver
getconf VROOTDIR `if [ -x "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | awk '{print $2}'; fi`
+ # canonicalize VROOTDIR
+ VROOTDIR=`readlink --canonicalize $VROOTDIR`
# init this library's global variables
vservers_are_available=no
found_vservers=
host_or_vservers=host
# check vservers real availability
if [ $vservers = yes ]; then
+ if [ ! -x "$VSERVERINFO" ]; then
+ `if [ "$arg" = nodialog ]; then echo fatal; else echo "msgBox warning"; fi` \
+ "vservers enabled in $conffile, but vserver-info command was not found. Please set the VSERVERINFO configuration variable to its full path."
+ return
+ fi
+ if [ ! -x "$VSERVER" ]; then
+ `if [ "$arg" = nodialog ]; then echo fatal; else echo "msgBox warning"; fi` \
+ "vservers enabled in $conffile, but vserver command was not found. Please set the VSERVER configuration variable to its full path."
+ return
+ fi
if [ -z "$VROOTDIR" ]; then
`if [ "$arg" = nodialog ]; then echo fatal; else echo "msgBox warning"; fi` \
"vservers enabled in $conffile, but VROOTDIR is not set and could not be guessed."
return
fi
found_vservers=`ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES" | tr "\n" " "`
- [ -n "$found_vservers" ] || return
+ if [ -z "$found_vservers" ]; then
+ `if [ "$arg" = nodialog ]; then echo warning; else echo "msgBox warning"; fi` \
+ "vservers enabled in $conffile, but no vserver was found in $VROOTDIR.";
+ return
+ fi
vservers_are_available=yes
fi
}