Changeset 3014 in MondoRescue for branches/3.0/mindi

Timestamp:

Jun 1, 2012, 3:10:35 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #617 and #615: Only non directtory are transferred to the rootfs by tar, in order to avoid linked dirs such as /lib to finish fully on it.

File:

• branches/3.0/mindi/mindi (modified) (5 diffs)

branches/3.0/mindi/mindi

@@ -386 +386 @@
     elif [ -e "/etc/console/boottime.kmap.gz" ] ; then
         LogFile "INFO: Debian-style config detected."
-        echo -en "Adding the following keyboard mapping tables: "
+        echo -en "INFO: Adding the following keyboard mapping tables: "
         mkdir -p $bigdir/tmp
         echo "/etc/console/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
@@ -397 +397 @@
     elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then
         LogFile "INFO: Ubuntu-style config detected."
-        echo -en "Adding the following keyboard mapping tables: "
+        echo -en "INFO: Adding the following keyboard mapping tables: "
         mkdir -p $bigdir/tmp
         if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
@@ -462 +462 @@
         return
     fi
-    echo -en "Adding the following keyboard mapping tables: "
+    echo -en "INFO: Adding the following keyboard mapping tables: "
     mkdir -p $bigdir/tmp
     echo "$mappath" > $bigdir/tmp/KEYMAP-LIVES-HERE
@@ -2526 +2526 @@
     done
     # Initial / are trucated by tar
-    tar cf - `sort -u $MINDI_TMP/minimal.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
+    finallist=""
+    # Remove directories from the list, as tar will create them anyway
+    # and it may hurt if /lib is in it as on Debian/Ubuntu
+    for f in `sort -u $MINDI_TMP/minimal.lis`; do
+        if [ ! -d $f ]; then
+            finallist="$finallist $f"
+        fi
+    done
+    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
@@ -3164 +3172 @@
 
 for i in loop cdrom ide-cd isofs linear raid0 raid1 raid5 ; do
-    modprobe $i 2>&1 > /dev/null
+    modinfo 2> /dev/null 1> /dev/null
+    if [ $? -eq 0 ]; then
+        modprobe $i 2>&1 > /dev/null
+    fi
 done