Changeset 1399 in MondoRescue

Timestamp:

May 7, 2007, 10:21:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug on lsmod | sed. (Andree Leidenfrost). As a consequence, lsmod is not used anymore in mindi (except for log). Replaced by /proc/modules. And the MODULES variable is now used to avoid code duplication.

Location:

branches/2.2.4/mindi

Files:

• mindi (modified) (7 diffs)
• rootfs/sbin/init (modified) (1 diff)

branches/2.2.4/mindi/mindi

@@ -72 +72 @@
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams"
 DENY_MODS=""
-# Force soma modules to be included
+# Force some modules to be included
 FORCE_MODS=""
 
@@ -939 +939 @@
     local module_list module fname oss r kern
     oss="/root/oss/modules"
-    module_list="`lsmod | sed -n '2,$s/ .*//'`"
+    module_list="$MODULES"
     # Remove unwanted modules from list
     for i in $DENY_MODS; do
@@ -976 +976 @@
             if echo $fname | grep lvm &> /dev/null ; then
                 echo "This warning only affects you if you are using LVM." >> $LOGFILE
-                if lsmod | grep lvm &> /dev/null ; then
+                if echo "$MODULES" | grep lvm &> /dev/null ; then
                     echo "I think you are, so please take heed!" >> $LOGFILE
 #                   LogIt "Where is liblvm? You need it."
@@ -1128 +1128 @@
     echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
     # BERLIOS: That code is duplicated - Should be done once only
-    list_to_echo="`lsmod | sed -n '2,$s/ .*//'`"
+    list_to_echo="$MODULES"
     # Remove unwanted modules from list
     for i in $DENY_MODS; do
@@ -2601 +2601 @@
     fi
 
-    lsmod > tmp/original-lsmod.txt
-    
     cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
     cd $old_pwd
@@ -2722 +2720 @@
 WhichOfTheseModulesAreLoaded() {
     local modname loaded_modules
-    loaded_modules=" `lsmod | tr -s ' ' '\t' | cut -f1 | grep -Fvx "Modules" | tr '\n' ' '` "
+    loaded_modules="$MODULES"
     for modname in $1 ; do
         [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname"
@@ -2894 +2892 @@
 echo "-------------" >> $LOGFILE
 lsmod >> $LOGFILE
+MODULES="`cat /proc/modules | awk '{print $1}'`"
 echo "-------------" >> $LOGFILE
 echo "Liste of extra modules is:" >> $LOGFILE

branches/2.2.4/mindi/rootfs/sbin/init

@@ -527 +527 @@
 #-------------------------------
 
-lsmod > /tmp/ramdisk-lsmod.txt 2> /dev/null
-cut -d' ' -f1 /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | sort | uniq -d > /tmp/missing-modules.txt
-echo "Warning - these modules did not make it onto the ramdisk" >> $LOGFILE
-cat /tmp/missing-modules.txt >> $LOGFILE
+echo "Result of lsmod" >> $LOGFILE
+echo "---------------" >> $LOGFILE
+lsmod >> $LOGFILE
 
 #ctrlaltdel soft