Changeset 2965 in MondoRescue for branches/3.0/mindi/rootfs/etc/init.d/rcS

Timestamp:

Mar 14, 2012, 2:42:33 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4564@localhost: bruno | 2012-03-13 00:55:09 +0100

• Fix more #589 by removing fixed path for grep in mindi, and managing correctly paths for udev related binaries in mindi and rcS

File:

• branches/3.0/mindi/rootfs/etc/init.d/rcS (modified) (5 diffs)

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -322 +322 @@
     ps | grep -v grep |grep udevd 2> /dev/null 1> /dev/null
     if [ $? -ne 0 ]; then
-        /sbin/udevd --daemon &
+        if [ -x /sbin/udevd ]; then
+            /sbin/udevd --daemon &
+        elif [ -x /usr/bin/udevd ]; then
+            /usr/bin/udevd --daemon &
+        fi
         echo "Waiting for udev to start..."
         sleep 5
@@ -337 +341 @@
         /sbin/udevsettle --timeout=10
         LogIt "Discovering with udevsettle"
-    elif [ -x /sbin/udevadm ]; then
-        UdevadmTrigger
-        /sbin/udevadm settle --timeout=10
+    elif [ -x /sbin/udevadm ] || [ -x /usr/bin/udevadm ]; then
+        ua=`UdevadmTrigger`
+        $ua settle --timeout=10
         LogIt "Discovering with udevadm"
     fi
@@ -709 +713 @@
 UdevadmTrigger() {
 
+# This function should just echo the return value $ua
+
 if [ -x /sbin/udevadm ]; then
-    v=`/sbin/udevadm --version`
-    echo "Triggering udev again..."
-    if [ "$v" -ge "146" ]; then
-        /sbin/udevadm trigger --type=failed
+    ua="/sbin/udevadm"
+elif [ -x /usr/bin/udevadm ]; then
+    ua="/usr/bin/udevadm"
+else
+    LogIt "WARNING: Unable to find udevadm. Not triggering udev"
+    ua="/bin/true"
+fi
+
+v="`$ua --version`"
+
+if [ -x "$v" ]; then
+    LogIt "Triggering udev again..."
+    if [ "$v" -ge "146" -a "$v" -lt "174" ]; then
+        $ua trigger --type=failed
+    elif [ "$v" -lt "146" ]; then
+        $ua trigger --retry-failed
     else
-        /sbin/udevadm trigger --retry-failed
-    fi
-fi
+        LogIt "... not needed"
+    fi
+fi
+echo $ua
 }
 
@@ -733 +752 @@
     # (useful for rules creating network ifcfg files)
     if [ -e "/tmp/USE-UDEV" ] ; then
-        UdevadmTrigger
+        ua=`UdevadmTrigger`
     fi
 }
@@ -940 +959 @@
 # Not sure it's still needed, but shouldn't hurt
 if [ -e "/tmp/USE-UDEV" ] ; then
-    UdevadmTrigger
+    ua=`UdevadmTrigger`
 fi
 if grep "backup-media-type" /tmp/mondo-restore.cfg > /dev/null 2> /dev/null ; then