Changeset 2569 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin/init

Timestamp:

Feb 2, 2010, 10:40:28 AM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2545:2567 /mondorescue/branches/2.2.9

• Improve device exclusion for LVM by adding support for symlinks and mapper systematically at all levels (PV, VG, LV). Shoul

d really provvide the best support possible for LVM exclusion.

• Now supports also exclusion of LVs directly
• Improve mindi by handling excluded devices earlier in the loop.
• Fix LV exclusion when VGs are excluded (the excludedvgs file has to be removed at start and end of analyze-my-lvm not in fu

nctions, as they are called multiple times)

• Rename some variables exported to avoid accidental conflict (EXCLUDE_DEVS => MINDI_EXCLUDE_DEVS and ADDITIONAL_BOOT_PARAMS

=> MINDI_ADDITIONAL_BOOT_PARAMS)

• setfattr also needs the -h flag to restore attributes on symlinks, not on the target file (which may not exist BTW). Should solve #388.
• Using forcemods="mod1 mod2" will now do something and load those modules first
• Update web page on distributions to download
• Add support for ums_cypress module in mindi
• Fix acl backup which was completely wrong.
• Fix a bug where LV were not created anymore if no exclusion !!
• In analyze-my-lvm only use pv.tmp2 when it exists to avoid error msgs

-Adds support for links to modules (.ko pointing to .o) such as with VMWare extensions

• Adds i-want-my-lvm content in mindi log file
• Adds vmxnet3 driver support to mindi for some VMWare versions
• Fix a typo in the way device mapper files where excluded
• use option -h of getfattr to *not* follow symlinks, which breaks RHEL 5.4 as reported in #388. However, getfacl doesn't provide such an option.
• Adds some logs for filelist creation
• Remove option -P from getfattr which may also skip symlinks - Attempt to solve #388
• Exclude rpc_pipefs type of filesystems from find
• Suppress unused mode_of_file function

File:

• branches/2.2.10/mindi/rootfs/sbin/init (modified) (5 diffs)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -394 +394 @@
         # Exclude devices we may not want
         rm -f /tmp/restorevgs
-        for d in $EXCLUDE_DEVS ; do
+        for d in $MINDI_EXCLUDE_DEVS ; do
             echo " == $d"
             EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
@@ -414 +414 @@
                     # FIXME: Should search for all possible device names here
                     grep -Ev "/dev/$v/$l" /tmp/mountlist.txt > /tmp/mountlist.txt.new
-                    grep -Ev "/dev/mapper/${v}-v$l" /tmp/mountlist.txt.new > /tmp/mountlist.txt
+                    grep -Ev "/dev/mapper/${v}-$l" /tmp/mountlist.txt.new > /tmp/mountlist.txt
                 done
             done
@@ -640 +640 @@
 ModprobeAllModules() {
 
-    for m in `find /lib/modules -name '*\.ko*' -o -name '*\.o*'`; do
+    lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'`
+    # loading forced modules first
+    for m in $lismod; do
+        k=`basename $m | sed 's/\.ko.*$//'`
+        j=`basename $k | sed 's/\.o.*$//'`
+        echo "$FORCE_MODS" | grep -q "$j "
+        if [ $? -eq 0 ]; then
+            echo "Forcing first $j..."
+            modprobe -q $j
+        fi
+    done
+    for m in $lismod; do
         k=`basename $m | sed 's/\.ko.*$//'`
         j=`basename $k | sed 's/\.o.*$//'`
@@ -646 +657 @@
         if [ $? -eq 0 ]; then
             echo "Denying $j..."
+            continue
+        fi
+        echo "$FORCE_MODS" | grep -q "$j "
+        if [ $? -eq 0 ]; then
             continue
         fi
@@ -714 +729 @@
 fi
 if [ "`grep -i excludedevs /proc/cmdline`" ]; then
-    export EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
+    export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
 else
-    export EXCLUDE_DEVS=" "
+    export MINDI_EXCLUDE_DEVS=" "
 fi