packages: VirtualBox/VirtualBox-vboxguest.init - unify

[glen]

Author: glen                         Date: Thu Mar 22 14:10:25 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify

---- Files affected:
packages/VirtualBox:
   VirtualBox-vboxguest.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox-vboxguest.init
diff -u packages/VirtualBox/VirtualBox-vboxguest.init:1.2 packages/VirtualBox/VirtualBox-vboxguest.init:1.3
--- packages/VirtualBox/VirtualBox-vboxguest.init:1.2	Tue Jan 11 23:41:50 2011
+++ packages/VirtualBox/VirtualBox-vboxguest.init	Thu Mar 22 15:10:19 2012
@@ -21,30 +21,32 @@
 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
-		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
+	if [ -d /dev/.udev ]; then
+		return
+	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)
+	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
 	fi
 }
 
================================================================

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