Author: baggins Date: Sun Nov 23 22:58:44 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- exit early if kernel not capable
- use subsys lock
- don't call stop on restart (don't shoot me foot ;)
---- Files affected:
SOURCES:
util-vserver.init (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/util-vserver.init
diff -u SOURCES/util-vserver.init:1.4 SOURCES/util-vserver.init:1.5
--- SOURCES/util-vserver.init:1.4 Sat Nov 22 18:39:26 2008
+++ SOURCES/util-vserver.init Sun Nov 23 23:58:38 2008
@@ -5,6 +5,15 @@
# chkconfig: 2345 10 99
# description: Sets the path to vshelper and kills all guest processes
+# if kernel not capable, exit early
+if [ ! -d /proc/virtual ]; then
+ case "$1" in
+ start|stop|reload|force-reload|restart)
+ exit 0
+ ;;
+ esac
+fi
+
# Source function library
. /etc/rc.d/init.d/functions
@@ -21,10 +30,14 @@
if [ -e /proc/sys/kernel/vshelper ]; then
echo "$_VSHELPER" >/proc/sys/kernel/vshelper
ok
+ RETVAL1=0
else
fail
+ RETVAL1=1
fi
run_cmd "Loading default device map" $__PKGLIBDIR/bash-wrapper
"handleDeviceMap --set 0 $__CONFDIR/.defaults/apps/vdevmap"
+ RETVAL=$?
+ [ "$RETVAL" -eq 0 -a "$RETVAL1" -eq 0 ] && touch
/var/lock/subsys/util-vserver
}
# Stop all running, but non-default guests"
@@ -60,6 +73,7 @@
ok
fi
fi
+ rm -f /var/lock/subsys/util-vserver >/dev/null 2>&1
}
RETVAL=0
@@ -71,11 +85,7 @@
stop)
stop
;;
- restart)
- stop
- start
- ;;
- reload|force-reload)
+ restart|reload|force-reload)
start
[ $? -ne 0 ] && RETVAL=7
;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/util-vserver.init?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
