Changes in branches/3.0/mindi/mindi [2948:2951]

File:

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

branches/3.0/mindi/mindi

@@ -1069 +1069 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
+    printf "        %-15s %-15s %-15s %-13s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1 tmpfs devpts sysfs proc debugfs"
     for c_p in $all_partitions ; do
@@ -2486 +2486 @@
 
     [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
-
-    # Handle the case where busybox and mount are dynamically linked
-    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
-    if [ $? -eq 0 ]; then
-        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
-        rm -f bin/mount $MINDI_TMP/busy.lis
-        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/busy.lis
-        # Special for libs
-        for f in `grep -E "libnss" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2`; do
-            echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
-        done
-        # Initial / are trucated by tar
-        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in mount analysis" $MINDI_TMP/$$.log
-        rm -f $MINDI_TMP/busy.lis
-    fi
-
+    
     # Copy of files mandatory for ssh to automate mount if sshfs is used
     mkdir $mountpoint/.ssh
@@ -2514 +2498 @@
     cp -rp /etc/ld.so.c* $mountpoint/etc
 
-    # Avoid an issue on some distro (RHEL5)
+    # Handle the case where busybox and mount are dynamically linked
+    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
+    if [ $? -eq 0 ]; then
+        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
+        rm -f bin/mount
+    fi
+
+    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
+    minimallis=`grep -Ev '^#' $DEPLIST_DIR/minimal.conf`
+    rm -f $MINDI_TMP/minimal.lis
+    for f in $MINDI_LIB/rootfs/bin/busybox $minimallis; do
+        echo $f >> $MINDI_TMP/minimal.lis
+    done
+    LocateDeps $MINDI_LIB/rootfs/bin/busybox $minimallis >> $MINDI_TMP/minimal.lis
+    for f in `cat $MINDI_TMP/minimal.lis`; do
+        echo "`ReadAllLink $f`" >> $MINDI_TMP/minimal.lis
+    done
+    # Initial / are trucated by tar
+    tar cf - `sort -u $MINDI_TMP/minimal.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in minimal analysis" $MINDI_TMP/$$.log
+    bash
+    rm -f $MINDI_TMP/minimal.lis
+
+    # Avoids an issue on some distro (RHEL5)
     rm -f $mountpoint/etc/ld.so.conf.d/kernelcap*