From 9409074c8cbb33d3bdaaa37dfb80b4d793b55476 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 24 Mar 2012 16:38:58 +0000 Subject: [PATCH] - sync with vboxdrv.init Changed files: VirtualBox-vboxguest.init -> 1.5 --- VirtualBox-vboxguest.init | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/VirtualBox-vboxguest.init b/VirtualBox-vboxguest.init index b014a45..ae34456 100644 --- a/VirtualBox-vboxguest.init +++ b/VirtualBox-vboxguest.init @@ -21,18 +21,19 @@ VBOX_MODULE="vboxguest" 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 @@ setup() { } 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 @@ case "$1" in stop start ;; + try-restart) + condrestart 0 + ;; + force-reload) + condrestart 7 + ;; setup) setup ;; @@ -99,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 -- 2.43.0