packages: VirtualBox/VirtualBox-vboxdrv.init, VirtualBox/VirtualBox-vboxgue...

glen glen at pld-linux.org
Thu Mar 22 15:11:46 CET 2012


Author: glen                         Date: Thu Mar 22 14:11:45 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not setup subsys lock if module load failed

---- Files affected:
packages/VirtualBox:
   VirtualBox-vboxdrv.init (1.8 -> 1.9) , VirtualBox-vboxguest.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox-vboxdrv.init
diff -u packages/VirtualBox/VirtualBox-vboxdrv.init:1.8 packages/VirtualBox/VirtualBox-vboxdrv.init:1.9
--- packages/VirtualBox/VirtualBox-vboxdrv.init:1.8	Tue Jan 11 23:41:50 2011
+++ packages/VirtualBox/VirtualBox-vboxdrv.init	Thu Mar 22 15:11:40 2012
@@ -20,11 +20,12 @@
 
 setup() {
 	modprobe -s $VBOX_MODULE
+	RETVAL=$?
 	if [ -d /dev/.udev ]; then
-		return
+		return $RETVAL
 	fi
 
-	# set proper /dev/vboxdrv for systems with static dev
+	# 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)
@@ -36,17 +37,21 @@
 			VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices)
 		fi
 	fi
+
 	if [ -z "$VBOX_MAJOR" ]; then
 		/sbin/rmmod $VBOX_MODULE
-		fail
+		RETVAL=1
 	elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then
+		RETVAL=$?
 		rmmod $VBOX_MODNAME
 		fail
 	elif ! chown root:vbox $VBOX_DEVICE; then
+		RETVAL=$?
 		fail
 	else
 		ok
 	fi
+	return $RETVAL
 }
 
 start() {
@@ -54,7 +59,7 @@
 		return
 	fi
 
-	setup
+	setup || exit $?
 	touch /var/lock/subsys/vboxdrv
 }
 

================================================================
Index: packages/VirtualBox/VirtualBox-vboxguest.init
diff -u packages/VirtualBox/VirtualBox-vboxguest.init:1.3 packages/VirtualBox/VirtualBox-vboxguest.init:1.4
--- packages/VirtualBox/VirtualBox-vboxguest.init:1.3	Thu Mar 22 15:10:19 2012
+++ packages/VirtualBox/VirtualBox-vboxguest.init	Thu Mar 22 15:11:40 2012
@@ -20,9 +20,9 @@
 
 setup() {
 	modprobe -s $VBOX_MODULE
-	# set proper /dev/vboxdrv for systems with static dev
+	RETVAL=$?
 	if [ -d /dev/.udev ]; then
-		return
+		return $RETVAL
 	fi
 
 	# set proper $VBOX_DEVICE for systems with static dev
@@ -37,24 +37,28 @@
 			VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices)
 		fi
 	fi
+
 	if [ -z "$VBOX_MAJOR" ]; then
 		/sbin/rmmod $VBOX_MODULE
-		fail
+		RETVAL=1
 	elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then
+		RETVAL=$?
 		rmmod $VBOX_MODNAME
 		fail
 	elif ! chown root:vbox $VBOX_DEVICE; then
+		RETVAL=$?
 		fail
 	else
 		ok
 	fi
+	return $RETVAL
 }
 
 start() {
 	if [ -f /var/lock/subsys/vboxguest ]; then
 		return
 	fi
-	setup
+	setup || exit $?
 	touch /var/lock/subsys/vboxguest
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/VirtualBox/VirtualBox-vboxdrv.init?r1=1.8&r2=1.9
    http://cvs.pld-linux.org/packages/VirtualBox/VirtualBox-vboxguest.init?r1=1.3&r2=1.4



More information about the pld-cvs-commit mailing list