simplify umounting

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

diff --git a/VirtualBox-vboxsf.init b/VirtualBox-vboxsf.init
old mode 100644 (file)
new mode 100755 (executable)
index 097ae7a..992c151
--- a/VirtualBox-vboxsf.init
+++ b/VirtualBox-vboxsf.init
@@ -1,18 +1,13 @@
 #!/bin/sh
 #
 # virtualbox   VirtualBox virtualizer for x86 hardware
-#
-# chkconfig:   345 84 25
-#
-# description: InnoTek VirtualBox is a general-purpose full virtualizer for x86 
+# chkconfig:   345 84 16
+# description: Oracle VirtualBox is a general-purpose full virtualizer for x86 \
 #              hardware. Targeted at server, desktop and embedded use.
-#
-# $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
-VBOX_DEVICE="/dev/vboxsf"
 VBOX_MODULE="vboxsf"
 
 # Get service config - may override defaults
@@ -24,12 +19,19 @@ start() {
        fi
 
        modprobe -s $VBOX_MODULE
+       run_cmd "Mount VirtualBox Shared Folders:" mount -a -t vboxsf
        touch /var/lock/subsys/vboxsf
 }
 
 stop() {
-       # NOTE: rmmod will wait if device is in use, so automatic rmmod probably is not the best idea
-       /sbin/rmmod $VBOX_MODULE
+       if [ ! -f  /var/lock/subsys/vboxsf ]; then
+               return
+       fi
+       run_cmd "Unmount VirtualBox Shared Folders:" umount -a -t vboxsf
+
+       # NOTE: rmmod will say module in use if there are remaining mounts
+       rmmod -s $VBOX_MODULE
+
        rm -f /var/lock/subsys/vboxsf
 }