Changeset 3081 in MondoRescue for branches/3.0

Timestamp:

Jan 25, 2013, 5:44:14 AM (11 years ago)

Author:

Bruno Cornec

Message:

• mindi now uses the full content of minimal.conf in deplist to include it in the boot media. Prevously only a fraction of it was included. This may have an impact so entering again in a test phase before release

File:

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

branches/3.0/mindi/mindi

@@ -1451 +1451 @@
     if [ "$ML01" -ne "$ML1" ]; then
         LogFile "--------------------------------------------"
-        LagAll "WARNING: Duplicate device entry in mountlist"
+        LogAll "WARNING: Duplicate device entry in mountlist"
         LogFile "--------------------------------------------"
     fi
@@ -2560 +2560 @@
 
     # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
-    mountlis=`grep -E "mount|fuse|ssh|libnss|bash" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
-    rm -f $MINDI_TMP/minimal.lis
-    for f in $MINDI_LIB/rootfs/bin/busybox $mountlis; do
-        echo $f >> $MINDI_TMP/minimal.lis
+    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
+    for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
+        if [ -r $f ]; then
+            echo $f >> $MINDI_TMP/minimal.lis
+            LocateDeps $f >> $MINDI_TMP/minimal2.lis
+        fi
     done
-    LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/minimal.lis
-    for f in `cat $MINDI_TMP/minimal.lis`; do
-        echo "`ReadAllLink $f`" >> $MINDI_TMP/minimal.lis
+    for f in `cat $MINDI_TMP/minimal.lis` `sort -u $MINDI_TMP/minimal2.lis`; do
+        ReadAllLink $f >> $MINDI_TMP/minimal.lis
     done
     # Initial / are trucated by tar
@@ -2578 +2579 @@
         fi
     done
-    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
+    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || 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
     ln -sf /bin/bash bin/sh
     LogIt "INFO: Using bash as default shell"
-    rm -f $MINDI_TMP/minimal.lis
+    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
 
     # Avoids an issue on some distro (RHEL5)