Changeset 18056 in vbox for trunk/src/VBox

Timestamp:

Mar 18, 2009 12:09:15 PM (16 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: only change the permissions on vboxuser if the device actually exists

File:

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

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

@@ -205 +205 @@
         }
     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"
+    }
+
     if [ ! -c $userdev ]; then
         maj=10
@@ -214 +221 @@
                 fail "Cannot create device $userdev with major $maj and minor $min"
             }
-        fi
-    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"
-    }
+            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"
+            }
+        fi
+    fi
 
     if [ -n "$BUILDVBOXVFS" ]; then