Changeset 2594 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin/init

Timestamp:

Mar 17, 2010, 3:55:16 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3735@localhost: bruno | 2010-03-14 19:50:12 +0100

• Avoids remaining error messages at restore time in new mindi
• Adapt group file to include latest one needed by udev
• Explicitely add a dep on libnss_files.so.2 needed for uid resolution at restore time

File:

• branches/2.2.10/mindi/rootfs/sbin/init (modified) (4 diffs)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -91 +91 @@
     openvt -l /bin/sh /sbin/wait-for-petris
     openvt -l /usr/bin/tail -f $LOGFILE
-    # May avoid shell error messages
-    # chmod 666 /dev/tty* /dev/console
     # By default first serial line is configured as tty
     # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)
@@ -313 +311 @@
         /sbin/udevadm settle --timeout=10
     fi
-    # It seems we need to have more static devs on some distro were
-    # udev as some other requirements to be covered later on.
+    # It seems we need to have more static devs on some distro where
+    # udev has some other requirements to be covered later on.
     # So in the mean time:
     for d in `ls /dev.static`; do
@@ -321 +319 @@
         fi
     done
-    rm -rf /dev.static
     echo $PKLVL > /proc/sys/kernel/printk
 }
@@ -680 +677 @@
     if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
         if [ -x /sbin/udevadm ]; then
-            /sbin/udevadm trigger --retry-failed
+            udaver=`/sbin/udevadm --version`
+            if [ $udaver -lt 146 ]; then
+                /sbin/udevadm trigger --retry-failed
+            else
+                # After version 146 option --retry-failed doesn't exist anymore
+                /sbin/udevadm trigger
+            fi
         fi
     fi