there is no 'vbox' group in guest, and chowning is not neccessary in guest

[packages/VirtualBox.git] / VirtualBox-vboxguest.init

diff --git a/VirtualBox-vboxguest.init b/VirtualBox-vboxguest.init
old mode 100644 (file)
new mode 100755 (executable)
index 4d72283..01fd1bf
--- a/VirtualBox-vboxguest.init
+++ b/VirtualBox-vboxguest.init
@@ -4,7 +4,7 @@
 #
 # chkconfig:   345 83 26
 #
-# description: InnoTek VirtualBox is a general-purpose full virtualizer for x86 
+# description: Oracle VirtualBox is a general-purpose full virtualizer for x86 \
 #              hardware. Targeted at server, desktop and embedded use.
 #
 # $Id$
@@ -12,54 +12,71 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-VBOX_DEVICE="/dev/vboxguest"
 VBOX_MODULE="vboxguest"
+VBOX_GUEST_DEVICE="/dev/vboxguest"
+VBOX_USER_DEVICE="/dev/vboxuser"
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox
 
 setup() {
+       local VBOX_MODULE=$1 VBOX_DEVICE=$2
        modprobe -s $VBOX_MODULE
-       # set proper /dev/vboxdrv for systems with static dev
-       if [ ! -d /dev/.udev ]; then
-               show "Setting $VBOX_DEVICE entry"
-               busy
-               rm -f $VBOX_DEVICE
-               VBOX_MAJOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/devices)
-               if [ -n "$VBOX_MAJOR" ]; then
-                       VBOX_MINOR=0
-               else
-                       VBOX_MINOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/misc)
-                       if [ -n "$VBOX_MINOR" ]; then
-                               VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices)
-                       fi
-               fi
-               if [ -z "$VBOX_MAJOR" ]; then
-                       /sbin/rmmod $VBOX_MODULE
-                       fail
-               elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then
-                       rmmod $VBOX_MODNAME
-                       fail
-               elif ! chown root:vbox $VBOX_DEVICE; then
-                       fail
-               else
-                       ok
+       RETVAL=$?
+
+       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 -vdevice="${VBOX_DEVICE#/dev/}" '$2 == device {print $1}' /proc/devices)
+       if [ -n "$VBOX_MAJOR" ]; then
+               VBOX_MINOR=0
+       else
+               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
        fi
+
+       if [ -z "$VBOX_MAJOR" ]; then
+               /sbin/rmmod $VBOX_MODULE
+               RETVAL=1
+       elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then
+               RETVAL=$?
+               rmmod $VBOX_MODNAME
+               fail
+       else
+               ok
+       fi
+       return $RETVAL
 }
 
 start() {
-       if [ -f /var/lock/subsys/vboxguest ]; then
+       if [ -f /var/lock/subsys/$VBOX_MODULE ]; then
                return
        fi
-       setup
-       touch /var/lock/subsys/vboxguest
+
+       setup $VBOX_MODULE $VBOX_GUEST_DEVICE || exit $?
+       setup $VBOX_MODULE $VBOX_USER_DEVICE || exit $?
+       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
@@ -75,6 +92,12 @@ case "$1" in
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   setup)
        setup
        ;;
@@ -93,7 +116,7 @@ case "$1" in
        fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|setup|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|setup|status}"
        exit 3
 esac