Changeset 2437 in MondoRescue

Timestamp:

Sep 29, 2009, 10:41:56 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix udev support in init for Mandriva 2009.1 (udevadm settle is blocking)

Location:

branches/2.2.9/mindi

Files:

• deplist.d/minimal.conf (modified) (2 diffs)
• rootfs/sbin/init (modified) (2 diffs)

branches/2.2.9/mindi/deplist.d/minimal.conf

@@ -15 +15 @@
 /bin/df
 /usr/bin/loadkeys
+/sbin/pidof
 
 # Compression
@@ -62 +63 @@
 /sbin/udev
 /sbin/udevstart
+/sbin/create_static_dev_nodes
 /etc/init.d/functions
 

branches/2.2.9/mindi/rootfs/sbin/init

@@ -297 +297 @@
     fi
     # Depending on udevd version it gives back the hand or not :-(
-    /sbin/udevd --daemon &
-    sleep 5
+    ps | grep udevd 2> /dev/null 1> /dev/null
+    if [ $? -ne 0 ]; then
+        /sbin/udevd --daemon &
+        echo "Waiting for udev to start..."
+        sleep 5
+    fi
     mkdir -p /dev/.udev/queue/
     if [ -x /sbin/udevtrigger ]; then
@@ -305 +309 @@
     create_dev_makedev
     # Newer version use udevadm for that
-    if [ -x /sbin/udevadm ]; then
-            /sbin/udevadm settle --timeout=10
-    elif [ -x /sbin/udevsettle ]; then
+    if [ -x /sbin/udevsettle ]; then
         /sbin/udevsettle
+    elif [ -x /sbin/udevadm ]; then
+        /sbin/udevadm trigger 
+        /sbin/udevadm settle --timeout=10 &
+        echo "Waiting for udev to discover..."
+        sleep 10
     fi
     # It seems we need to have more static devs on some distro were