Changeset 3277 in MondoRescue

Timestamp:

Apr 30, 2014, 1:42:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Include not only content of udev.conf files but if directories in it, do that recursively
• If using systemd-udev, do not extract all devs as it perturbates LVM
• First version where mindi works out of the box with Fedora 20

Location:

branches/3.2/mindi

Files:

• mindi (modified) (1 diff)
• rootfs/etc/init.d/rcS (modified) (6 diffs)

branches/3.2/mindi/mindi

@@ -2540 +2540 @@
     fi
 
-    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
+    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf & udev.conf file (which includes all busybox deps)
     rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
-    for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
-        if [ -r $f ]; then
-            echo $f >> $MINDI_TMP/minimal.lis
-            LocateDeps $f >> $MINDI_TMP/minimal2.lis
+    for f in `cat $DEPLIST_DIR/minimal.conf $DEPLIST_DIR/udev.conf | grep -vE " *#.*|^#" | sort -u` ; do
+        if [ -d $f ]; then
+            for g in `find $f`; do 
+                echo $g >> $MINDI_TMP/minimal.lis
+                LocateDeps $g  >> $MINDI_TMP/minimal2.lis
+            done
+        else 
+            if [ -r $f ]; then
+                echo $f >> $MINDI_TMP/minimal.lis
+                LocateDeps $f >> $MINDI_TMP/minimal2.lis
+            fi
         fi
     done

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

@@ -74 +74 @@
 ExtractDevTarballs() {
     cd /
-    for fname in ataraid.tgz ida.tgz i2o.tgz rd.tgz raw.tgz cciss.tgz nst.tgz dm.tgz vc.tgz ; do
-        if [ ! -e "/$fname" ] ; then
-            LogIt "/$fname not found; cannot extract to /." 1
-        else
-            echo -en "\rExtracting /$fname...     "
-            tar -zxf /$fname || LogIt "Error occurred while extracting /$fname"
-        fi
-    done
+    if [ -x /usr/lib/systemd/systemd-udevd ]; then
+        # Just use vc dev files. The other are useless and create huge delays with LVM
+        tar -zxf /vc.tgz || LogIt "Error occurred while extracting /vc.tgz"
+    else
+        for fname in ataraid.tgz ida.tgz i2o.tgz rd.tgz raw.tgz cciss.tgz nst.tgz dm.tgz vc.tgz ; do
+            if [ ! -e "/$fname" ] ; then
+                LogIt "/$fname not found; cannot extract to /." 1
+            else
+                echo -en "\rExtracting /$fname...     "
+                tar -zxf /$fname || LogIt "Error occurred while extracting /$fname"
+            fi
+        done
+    fi
     echo -en "\r"
     LogIt "Extracted additional /dev entries OK.     " 1
@@ -396 +401 @@
     ps | grep -v grep |grep udevd 2> /dev/null 1> /dev/null
     if [ $? -ne 0 ]; then
+        echo "Waiting for udev to start..."
         if [ -x /sbin/udevd ]; then
             /sbin/udevd --daemon &
@@ -402 +408 @@
         elif [ -x /usr/lib/systemd/systemd-udevd ]; then
             # from https://github.com/hut/minirc/blob/master/rc
+            echo "INFO: This is the systemd version of udev"
             mkdir -p /run/systemd/journal
             /usr/lib/systemd/systemd-udevd --daemon
@@ -407 +414 @@
             udevadm trigger --action=add --type=devices
         fi
-        echo "Waiting for udev to start..."
         sleep 5
         LogIt "udev started manually" 1
@@ -487 +493 @@
         # Recent LVM need this caching daemon to work
         if [ -x /usr/sbin/lvmetad ]; then
+            mkdir -p /run/lvm
             /usr/sbin/lvmetad
         fi
@@ -863 +870 @@
 rm -f $LOGFILE
 
+mkdir /proc 2> /dev/null
+mount /proc /proc -t proc
+
 # Creates log file
 LogIt ""
-echo "Welcome to init (from mindi ${MINDI_VER}-r${MINDI_REV})" | tee -a $LOGFILE
-
-mkdir /proc 2> /dev/null
-mount /proc /proc -v -t proc  2>> $LOGFILE
-mkdir /sys 2> /dev/null
-mount /sys /sys -v -t sysfs 2>> $LOGFILE
-
 # Redirect every message to the LOGFILE
 exec > >(tee -a ${LOGFILE})
 exec 2> >(tee -a ${LOGFILE} >&2)
+
+echo "Welcome to init (from mindi ${MINDI_VER}-r${MINDI_REV})" | tee -a $LOGFILE
+
+mkdir /sys 2> /dev/null
+mount /sys /sys -t sysfs
 
 [ ! "$GROOVY" ] && Die "I'm not groovy!"