Author: glen Date: Tue Dec 29 09:37:11 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- add "setup" target mentioned by ui
---- Files affected:
packages/VirtualBox:
VirtualBox-vboxdrv.init (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox-vboxdrv.init
diff -u packages/VirtualBox/VirtualBox-vboxdrv.init:1.6
packages/VirtualBox/VirtualBox-vboxdrv.init:1.7
--- packages/VirtualBox/VirtualBox-vboxdrv.init:1.6 Wed Jan 14 11:11:38 2009
+++ packages/VirtualBox/VirtualBox-vboxdrv.init Tue Dec 29 10:37:06 2009
@@ -18,39 +18,44 @@
# Get service config - may override defaults
[ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox
-start() {
- if [ ! -f /var/lock/subsys/vboxdrv ]; then
- 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
+setup() {
+ 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
- touch /var/lock/subsys/vboxdrv
+ 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
+ fi
fi
}
+start() {
+ if [ -f /var/lock/subsys/vboxdrv ]; then
+ return
+ fi
+
+ setup
+ touch /var/lock/subsys/vboxdrv
+}
+
stop() {
# NOTE: rmmod will wait if device is in use, so automatic rmmod
probably is not the best idea
/sbin/rmmod $VBOX_MODULE
@@ -70,6 +75,9 @@
stop
start
;;
+ setup)
+ setup
+ ;;
status)
if ! is_module $VBOX_MODULE; then
echo "$VBOX_MODULE module is loaded"
@@ -85,7 +93,7 @@
fi
;;
*)
- msg_usage "$0 {start|stop|restart|status}"
+ msg_usage "$0 {start|stop|restart|setup|status}"
exit 3
esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox-vboxdrv.init?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
