Changeset 1759 in MondoRescue for branches/2.2.5/mindi

Timestamp:

Nov 1, 2007, 3:17:23 PM (16 years ago)

Author:

Bruno Cornec

Message:

Tries to add udev support also for rhel4

Location:

branches/2.2.5/mindi

Files:

• install.sh (modified) (1 diff)
• mindi (modified) (1 diff)
• rootfs/sbin/init (modified) (1 diff)
• udev.files (added)

branches/2.2.5/mindi/install.sh

@@ -77 +77 @@
 install -m 755 analyze-my-lvm $locallib/mindi
 install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
-install -m 644 deplist.txt $conf
+install -m 644 deplist.txt udev.files $conf
 
 # Substitute variables for mindi

branches/2.2.5/mindi/mindi

@@ -2780 +2780 @@
 
     # Management of udev (which includes modprobe in rules)
-    ps auxww | grep -v grep | grep -q /udevd
+    ps auxww | grep -v grep | grep -qw udevd
     if [ $? -eq 0 ]; then
         echo "udev device manager found" > tmp/USE-UDEV
+        LogIt "udev device manager found"
         cp --parents -Rdf /etc/udev . 2> /dev/null
         cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
         if [ -x /sbin/udevd ]; then
-            LocateDeps /sbin/udevd /sbin/modprobe /sbin/insmod > $MINDI_TMP/udev.lis
-            rm -f sbin/modprobe sbin/insmod
-            cp --parents -Rdf /sbin/udevd /sbin/modprobe /sbin/insmod `sort -u $MINDI_TMP/udev.lis` .
+            lis=`grep -Ev'^#' $MINDI_CONF/udev.files` 
+            LocateDeps $lis > $MINDI_TMP/udev.lis
+            for i in $lis; do
+                if [ "`echo $i | cut -c1`" = "/" ]; then
+                    j=`echo $i | cut -c2-`
+                    rm -f $j
+                fi
+            done
+            cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
             rm -f $MINDI_TMP/udev.lis
         else

branches/2.2.5/mindi/rootfs/sbin/init

@@ -280 +280 @@
     PKLVL=`cut -f1 /proc/sys/kernel/printk`
     echo 0 > /proc/sys/kernel/printk
-    /sbin/udevd --daemon
+    if [ -x /sbin/startudev ]; then
+        /sbin/startudev
+    fi
+    # Depending on udevd version it gives back the hand or not :-(
+    /sbin/udevd --daemon &
+    sleep 2
     echo $PKLVL > /proc/sys/kernel/printk
-    # Avoids shell error messages
+    # May avoid shell error messages
     chmod 644 /dev/tty*
 }