X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=gentoo%2Futil-vserver;h=c7ff3595f81a131317b0d2094bd9224d526d99f9;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=18273262ad85a4d905be7d8a35d5f29e7775c254;hpb=9234e6a7cb48373edec38284ba54a819037b79b2;p=util-vserver.git

diff --git a/gentoo/util-vserver b/gentoo/util-vserver
index 1827326..c7ff359 100644
--- a/gentoo/util-vserver
+++ b/gentoo/util-vserver
@@ -29,36 +29,32 @@ kill_contexts() {
 
 start() {
 	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
-	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
+	if [ ! -e ${UTIL_VSERVER_VARS} ]; then
 		eerror "Cannot find util-vserver installation"
 		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
 		return 1
 	fi
 	
-	source ${UTIL_VSERVER_VARS}
-	source "$_LIB_FUNCTIONS"
-	source "$__PKGLIBDIR/vserver.functions"
+	. ${UTIL_VSERVER_VARS}
 
 	ebegin "Setting vshelper path to $_VSHELPER"
 	set_helper
 	eend $?
 
 	ebegin "Loading default device map"
-	loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap"
+	$__PKGLIBDIR/bash-wrapper 'loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap"'
 	eend $?
 }
 
 stop() {
 	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
-	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
+	if [ ! -e ${UTIL_VSERVER_VARS} ]; then
 		eerror "Cannot find util-vserver installation"
 		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
 		return 1
 	fi
 	
-	source ${UTIL_VSERVER_VARS}
-	source "$_LIB_FUNCTIONS"
-	source "$__PKGLIBDIR/vserver.functions"
+	. ${UTIL_VSERVER_VARS}
 
 	ebegin "Stopping all running guests"
 	$_START_VSERVERS -j 1 --all --stop