Changeset 569

Timestamp:

04/19/13 08:23:52 (8 years ago)

Author:

dennis

Message:

Some minor changes to make sure that we don't try to create devices when they already exists

File:

• trunk/initrd/sali/init (modified) (3 diffs)

trunk/initrd/sali/init

@@ -30 +30 @@
 _DMESG="/bin/dmesg"
 
-## Are we allowed to run?
-if [ -n "$($_MOUNT | $_GREP "/dev")" ]
-then
-    $_PRINTF "Looks like /dev is already mounted, this script can only be used for initialization of SALI\n"
-    exit 1
-fi
-
 ## Default value for init
 init="/sbin/init"
@@ -53 +46 @@
 $_MOUNT -t proc proc /proc
 $_MOUNT -t sysfs sysfs /sys
-$_MOUNT -t devtmpfs -o mode=0755 tmpfs /dev
+$_MOUNT -t devtmpfs -o mode=0755 udev /dev
 $_MOUNT -t tmpfs -o mode=0755 tmpfs /run
 
@@ -94 +87 @@
     $_GREP '^[^#]' /etc/udev/links.conf | while read type name args
     do
-        if [ "${type}" -a "${name}" -a ! -e "/dev/${name}" -a ! -L "/dev/${name}" ]
+        if [ "${type}" -a "${name}" ]
         then
-            continue
+            if [ ! -e "/dev/${name}" -o ! -L "/dev/${name}" ]
+            then
+                continue
+            fi
         fi
         case "${type}" in