Changeset 1780 in MondoRescue

Timestamp:

Nov 9, 2007, 8:34:53 PM (16 years ago)

Author:

Bruno Cornec

Message:

In udev case do not insert modules at all (udev should do it alone)
May avoid the issue with rhel4.5 kernel ? To be tested

Location:

branches/2.2.5

Files:

• mindi/rootfs/sbin/init (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/2.2.5/mindi/rootfs/sbin/init

@@ -498 +498 @@
     echo "Installing additional tools ..."
     install-additional-tools
-    echo "Inserting modules ..."
-    # Keep the kernel silent again
-    PKLVL=`cut -f1 /proc/sys/kernel/printk`
-    echo 0 > /proc/sys/kernel/printk
-    insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
-    echo $PKLVL > /proc/sys/kernel/printk
+    if [ ! -e "/tmp/USE-UDEV" ] ; then
+        echo "Inserting modules ..."
+        # Keep the kernel silent again
+        PKLVL=`cut -f1 /proc/sys/kernel/printk`
+        echo 0 > /proc/sys/kernel/printk
+        insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
+        echo $PKLVL > /proc/sys/kernel/printk
+    fi
 }
 
@@ -545 +547 @@
 LaunchTerminals
 
-# Keeping kernel silent  for module insertion
-PKLVL=`cut -f1 /proc/sys/kernel/printk`
-echo 0 > /proc/sys/kernel/printk
-InsertEssentialModules
-echo $PKLVL > /proc/sys/kernel/printk
+if [ ! -e "/tmp/USE-UDEV" ] ; then
+    # Keeping kernel silent  for module insertion
+    PKLVL=`cut -f1 /proc/sys/kernel/printk`
+    echo 0 > /proc/sys/kernel/printk
+    InsertEssentialModules
+    echo $PKLVL > /proc/sys/kernel/printk
+fi
 
 EnableCcissIfAppropriate

branches/2.2.5/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -33 +33 @@
         elif [ "$format" = "swap" ] ; then
             if [ "$opttun" = "-U" ]; then
-                LogIt "Creating uuid $label on swap partition $label"
+                LogIt "Creating uuid $label on swap partition $mountpt"
                 echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
             else