Changeset 2412 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Sep 19, 2009, 1:28:31 AM (15 years ago)

Author:

Bruno Cornec

Message:

• sshfs also needs ssh at restore time in initrd
• Better list of mandatory tools
• Adds fuse and sshfs support in initrd
• Split deplist.txt into multiple conf files under deplist.d in the conf dir. This will allow to have a minimal.conf file for initrd content to analyze to improve support of new embedded feature in the future (sshfs, live install). The other conf files contain the additional commands to put in the all.tar.gz. For the moment, mindi is still working the same. THis infra will allow that support in a near future. deplist.txt is now reserved for the admin additional commands.
• Remove useless script

(Backport from 2.2.9)

File:

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

branches/2.2.10/mindi/mindi

@@ -92 +92 @@
 fi
 DEPLIST_FILE="$MINDI_CONF/deplist.txt"
+DEPLIST_DIR="$MINDI_CONF/deplist.d"
+
 ISO_CMD="/usr/bin/mkisofs"
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
@@ -1844 +1846 @@
     includefile=$MINDI_TMP/$$.includefile.txt
 
-    lfiles="$DEPLIST_FILE"
+    if [ -e "$DEPLIST_FILE" ]; then
+        lfiles="$DEPLIST_FILE $DEPLIST_DIR/*"
+    else
+        lfiles="$DEPLIST_DIR/*"
+    fi
     lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
     ParseModprobeForIncludes $includefile
@@ -2231 +2237 @@
         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
         rm -f bin/mount $MINDI_TMP/busy.lis
-        mountlis=`grep mount $DEPLIST_FILE`
+        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`
         for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
             if [ -f $f ]; then