Changeset 35202 in vbox

Timestamp:

Dec 16, 2010 5:30:21 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69041

Message:

Additions/linux/installer: do not manually created device nodes if we have udevd

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (2 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -215 +215 @@
 }
 
-start()
-{
-    begin "Starting the VirtualBox Guest Additions ";
-    running_vboxguest || {
-        rm -f $dev || {
-            fail "Cannot remove $dev"
-        }
-
-        rm -f $userdev || {
-            fail "Cannot remove $userdev"
-        }
-
-        $MODPROBE vboxguest >/dev/null 2>&1 || {
-            fail "modprobe vboxguest failed"
-        }
-        sleep .5
-    }
+do_vboxguest_non_udev()
+{
     if [ ! -c $dev ]; then
         maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
@@ -276 +261 @@
         fi
     fi
+}
+
+start()
+{
+    begin "Starting the VirtualBox Guest Additions ";
+    which udevd >/dev/null || no_udev=1
+    running_vboxguest || {
+        rm -f $dev || {
+            fail "Cannot remove $dev"
+        }
+
+        rm -f $userdev || {
+            fail "Cannot remove $userdev"
+        }
+
+        $MODPROBE vboxguest >/dev/null 2>&1 || {
+            fail "modprobe vboxguest failed"
+        }
+        case "$no_udev" in 1)
+            sleep .5;;
+        esac
+    }
+    case "$no_udev" in 1)
+        do_vboxguest_non_udev;;
+    esac
 
     if [ -n "$BUILDVBOXSF" ]; then