Changeset 3039 in MondoRescue for branches/3.0/mindi/mindi

Timestamp:

Oct 6, 2012, 5:13:15 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #647: bash is now systematically included in the ramdisk

File:

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

branches/3.0/mindi/mindi

@@ -2528 +2528 @@
 
     # 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" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
+    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
@@ -2549 +2549 @@
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
-    grep -q bin/bash $MINDI_TMP/minimal.lis
-    if [ $? -eq 0 ]; then
-        ln -sf bin/bash bin/sh
-        LogIt "INFO: Using bash as default shell"
-    fi
+    ln -sf /bin/bash bin/sh
+    LogIt "INFO: Using bash as default shell"
     rm -f $MINDI_TMP/minimal.lis