packages: VirtualBox/VirtualBox-vboxguest.init - sync with vboxdrv.init

[glen]

Author: glen                         Date: Sat Mar 24 16:39:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sync with vboxdrv.init

---- Files affected:
packages/VirtualBox:
   VirtualBox-vboxguest.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox-vboxguest.init
diff -u packages/VirtualBox/VirtualBox-vboxguest.init:1.4 packages/VirtualBox/VirtualBox-vboxguest.init:1.5
--- packages/VirtualBox/VirtualBox-vboxguest.init:1.4	Thu Mar 22 15:11:40 2012
+++ packages/VirtualBox/VirtualBox-vboxguest.init	Sat Mar 24 17:38:58 2012
@@ -21,18 +21,19 @@
 setup() {
 	modprobe -s $VBOX_MODULE
 	RETVAL=$?
-	if [ -d /dev/.udev ]; then
+
+	if [ -d /dev/.udev ] || [ -d /run/udev/rules.d ]; then
 		return $RETVAL
 	fi
 
 	# set proper $VBOX_DEVICE for systems with static dev
 	show "Setting $VBOX_DEVICE entry"; busy
 	rm -f $VBOX_DEVICE
-	VBOX_MAJOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/devices)
+	VBOX_MAJOR=$(awk -vdevice="${VBOX_DEVICE#/dev/}" '$2 == device {print $1}' /proc/devices)
 	if [ -n "$VBOX_MAJOR" ]; then
 		VBOX_MINOR=0
 	else
-		VBOX_MINOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/misc)
+		VBOX_MINOR=$(awk -vdevice="${VBOX_DEVICE#/dev/}" '$2 == device {print $1}' /proc/misc)
 		if [ -n "$VBOX_MINOR" ]; then
 			VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices)
 		fi
@@ -55,17 +56,27 @@
 }
 
 start() {
-	if [ -f /var/lock/subsys/vboxguest ]; then
+	if [ -f /var/lock/subsys/$VBOX_MODULE ]; then
 		return
 	fi
+
 	setup || exit $?
-	touch /var/lock/subsys/vboxguest
+	touch /var/lock/subsys/$VBOX_MODULE
 }
 
 stop() {
 	# NOTE: rmmod will wait if device is in use, so automatic rmmod probably is not the best idea
 	/sbin/rmmod $VBOX_MODULE
-	rm -f /var/lock/subsys/vboxguest
+	rm -f /var/lock/subsys/$VBOX_MODULE
+}
+
+condrestart() {
+	if [ -f /var/lock/subsys/$VBOX_MODULE ]; then
+		stop
+		start
+	else
+		RETVAL=$1
+	fi
 }
 
 RETVAL=0
@@ -81,6 +92,12 @@
 	stop
 	start
 	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
+	;;
   setup)
 	setup
 	;;
@@ -99,7 +116,7 @@
 	fi
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|setup|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|setup|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/VirtualBox/VirtualBox-vboxguest.init?r1=1.4&r2=1.5