Changeset 1802 in MondoRescue

Timestamp:

Nov 15, 2007, 4:00:47 PM (17 years ago)

Author:

Bruno Cornec

Message:

• do not require perl modules (strict.pm) at restore time
• try to avoid modprobe messages at restore time

Location:

branches/2.2.5/mindi

Files:

• bkphw (deleted)
• deplist.txt (modified) (1 diff)
• install.sh (modified) (1 diff)
• rootfs/sbin/init (modified) (3 diffs)

branches/2.2.5/mindi/deplist.txt

@@ -50 +50 @@
 /usr/share/misc/file/magic /usr/share/file/magic
 
-# For swap uuid support and probably then more in the future
+# For swap uuid support, ia64 and probably then more in the future
 /usr/bin/perl
 

branches/2.2.5/mindi/install.sh

@@ -96 +96 @@
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
     install -s -m 755 $local/sbin/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
+    # Try to avoid the need ot additional perl modules at the moment
+    perl -pi -e 's/use strict;//' $locallib/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin

branches/2.2.5/mindi/rootfs/sbin/init

@@ -531 +531 @@
 }
 
+ModprobeAllModules() {
+
+    for m in *.ko; do
+        j=`echo $m | sed 's/\.ko$//'`
+        if [ -e $j ]; then
+            modprobe -q $j
+        fi
+    done
+}
 
 ExtractDataDisksAndLoadModules() {
@@ -537 +546 @@
     # Keep the kernel silent again
     PKLVL=`cut -f1 /proc/sys/kernel/printk`
+    echo 0 > /proc/sys/kernel/printk
     if [ ! -e "/tmp/USE-UDEV" ] ; then
         echo "Inserting modules ..."
-        echo 0 > /proc/sys/kernel/printk
         insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
     else
-        for m in *.ko; do
-            j=`echo $m | sed 's/\.ko$//'`
-            modprobe -q $j
-        done
+        ModprobeAllModules
     fi
     echo $PKLVL > /proc/sys/kernel/printk
@@ -596 +602 @@
     InsertEssentialModules
 else
-    for m in *.ko; do
-        j=`echo $m | sed 's/\.ko$//'`
-        modprobe -q $j
-    done
+    ModprobeAllModules
 fi
 echo $PKLVL > /proc/sys/kernel/printk