Changeset 2587 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin

Timestamp:

Mar 3, 2010, 8:24:24 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3714@localhost: bruno | 2010-03-03 10:42:28 +0100
svk merge -r3649:3678 prj/local-mondorescue/branches/2.2.9

r3666@localhost (orig r2578): bruno | 2010-02-12 13:35:29 +0100

• Free the sz_devfile fifo for ntfs later as it was used in between, causing a problem to backup NT

FS dev. Fix #392.

r3667@localhost (orig r2579): bruno | 2010-02-12 15:27:07 +0100
analyze-my-lvm now provides an option to call GiveMapperOfdm that can be used in mindi. Solve #395

r3668@localhost (orig r2580): bruno | 2010-02-12 17:12:18 +0100

• When using excludevs= also exclude from mountlist the devices mentioned. Fix #393.

r3669@localhost (orig r2581): bruno | 2010-02-12 17:15:53 +0100

• the post install ascript passed with post= should just exists and not be executable. It's now mad

e executable by init. Maybe a fix for #394

r3670@localhost (orig r2582): vicgat | 2010-02-15 19:35:39 +0100

r3671@localhost (orig r2583): bruno | 2010-02-15 20:05:45 +0100

• Fix reporting when a module is not found (pollutes logs)

r3672@localhost (orig r2584): bruno | 2010-02-15 20:09:23 +0100

• Adds a missing module for iSCSI support

r3673@localhost (orig r2585): bruno | 2010-02-15 20:45:50 +0100

• Fix problems of wrongly detected Duplicate mountpoints in case of lvm

r3674@localhost (orig r2586): bruno | 2010-02-16 13:15:38 +0100

• Avoids error messages from stat in analyze-my-lvm

r3663@athonet (orig r2577): bruno | 2010-02-09 02:08:39 +0100

• First try to improve OVM support with ocfs2 and Xen modules added

File:

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

branches/2.2.10/mindi/rootfs/sbin/init

@@ -395 +395 @@
         rm -f /tmp/restorevgs
         for d in $MINDI_EXCLUDE_DEVS ; do
-            echo " == $d"
+            echo "LVM exclusion == $d"
             EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
             vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
@@ -413 +413 @@
                 for l in $EXCLUDE_LVS; do
                     # 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}-$l" /tmp/mountlist.txt.new > /tmp/mountlist.txt
+                    grep -Ev "/dev/$v/$l" $MINDI_CACHE/mountlist.txt > $MINDI_CACHE/mountlist.txt.new
+                    grep -Ev "/dev/mapper/${v}-$l" $MINDI_CACHE/mountlist.txt.new > $MINDI_CACHE/mountlist.txt
                 done
             done
@@ -730 +730 @@
 if [ "`grep -i excludedevs /proc/cmdline`" ]; then
     export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
+    for d in $MINDI_EXCLUDE_DEVS ; do
+        echo "Mountlist exclusion == $d"
+        perl -i -ne 'print $_ unless m~$d~' $MINDI_CACHE/mountlist.txt
+    done
 else
     export MINDI_EXCLUDE_DEVS=" "
@@ -804 +808 @@
 WelcomeMessage
 RstHW
+[ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
 StartRaids
 StartMpath
@@ -817 +822 @@
     cp -af /dev/md2 /dev/md/2 2> /dev/null
 fi
-[ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
 
 if ! [ "`grep -i "pxe" $CMDLINE`" ] ; then
@@ -899 +903 @@
         post=`echo $post | sed 's|^/tmp/isodir|/tmp|'`
     fi
-    if [ -x $post ]; then
+    if [ -r $post ]; then
         echo "Executing final script $post"
         LogIt "Executing final script $post"
@@ -905 +909 @@
             mount-me
         fi
+        chmod 755 $post
         $post
         if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then