Author: glen Date: Sat Mar 24 12:51:54 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- sync with vboxnetadp
---- Files affected:
packages/VirtualBox:
VirtualBox-vboxdrv.init (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox-vboxdrv.init
diff -u packages/VirtualBox/VirtualBox-vboxdrv.init:1.9
packages/VirtualBox/VirtualBox-vboxdrv.init:1.10
--- packages/VirtualBox/VirtualBox-vboxdrv.init:1.9 Thu Mar 22 15:11:40 2012
+++ packages/VirtualBox/VirtualBox-vboxdrv.init Sat Mar 24 13:51:49 2012
@@ -28,11 +28,11 @@
# 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,18 +55,27 @@
}
start() {
- if [ -f /var/lock/subsys/vboxdrv ]; then
+ if [ -f /var/lock/subsys/$VBOX_MODULE ]; then
return
fi
setup || exit $?
- touch /var/lock/subsys/vboxdrv
+ 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/vboxdrv
+ rm -f /var/lock/subsys/$VBOX_MODULE
+}
+
+condrestart() {
+ if [ -f /var/lock/subsys/$VBOX_MODULE ]; then
+ stop
+ start
+ else
+ RETVAL=$1
+ fi
}
RETVAL=0
@@ -82,6 +91,12 @@
stop
start
;;
+ try-restart)
+ condrestart 0
+ ;;
+ force-reload)
+ condrestart 7
+ ;;
setup)
setup
;;
@@ -100,7 +115,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-vboxdrv.init?r1=1.9&r2=1.10
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
