Changeset 17859 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Mar 13, 2009 9:54:04 PM (16 years ago)

Author:

vboxsync

Message:

Additions/Linux/installer: add support for /dev/vboxuser to vboxadd.sh

File:

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

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

@@ -143 +143 @@
 
 dev=/dev/vboxadd
+userdev=/dev/vboxuser
 owner=vboxadd
 group=1
@@ -173 +174 @@
         rm -f $dev || {
             fail "Cannot remove $dev"
+        }
+
+        rm -f $userdev || {
+            fail "Cannot remove $userdev"
         }
 
@@ -200 +205 @@
         }
     fi
+    if [ ! -c $userdev ]; then
+        maj=0
+        min=`sed -n 's;\([0-9]\+\) vboxuser;\1;p' /proc/misc`
+        if [ ! -z "$min" ]; then
+            maj=10
+        fi
+        test ! -z "$maj" && mknod -m 0666 $userdev c $maj $min || {
+            rm -f $dev 2>/dev/null
+            rmmod vboxadd 2>/dev/null
+            fail "Cannot create device $userdev with major $maj and minor $min"
+        }
+    fi
     chown $owner:$group $dev 2>/dev/null || {
+        rm -f $dev 2>/dev/null
+        rm -f $userdev 2>/dev/null
         rmmod vboxadd 2>/dev/null
         fail "Cannot change owner $owner:$group for device $dev"
+    }
+    chown $owner:$group $userdev 2>/dev/null || {
+        rm -f $dev 2>/dev/null
+        rm -f $userdev 2>/dev/null
+        rmmod vboxadd 2>/dev/null
+        fail "Cannot change owner $owner:$group for device $userdev"
     }
 
@@ -240 +265 @@
     if running_vboxadd; then
         rmmod vboxadd 2>/dev/null || fail "Cannot unload module vboxadd"
+        rm -f $userdev || fail "Cannot unlink $userdev"
         rm -f $dev || fail "Cannot unlink $dev"
     fi