Changeset 3081 for branches/3.0/mindi


Ignore:
Timestamp:
Jan 25, 2013, 5:44:14 AM (7 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/mindi

    r3077 r3081  
    14511451    if [ "$ML01" -ne "$ML1" ]; then
    14521452        LogFile "--------------------------------------------"
    1453         LagAll "WARNING: Duplicate device entry in mountlist"
     1453        LogAll "WARNING: Duplicate device entry in mountlist"
    14541454        LogFile "--------------------------------------------"
    14551455    fi
     
    25602560
    25612561    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
    2562     mountlis=`grep -E "mount|fuse|ssh|libnss|bash" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
    2563     rm -f $MINDI_TMP/minimal.lis
    2564     for f in $MINDI_LIB/rootfs/bin/busybox $mountlis; do
    2565         echo $f >> $MINDI_TMP/minimal.lis
     2562    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
     2563    for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
     2564        if [ -r $f ]; then
     2565            echo $f >> $MINDI_TMP/minimal.lis
     2566            LocateDeps $f >> $MINDI_TMP/minimal2.lis
     2567        fi
    25662568    done
    2567     LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/minimal.lis
    2568     for f in `cat $MINDI_TMP/minimal.lis`; do
    2569         echo "`ReadAllLink $f`" >> $MINDI_TMP/minimal.lis
     2569    for f in `cat $MINDI_TMP/minimal.lis` `sort -u $MINDI_TMP/minimal2.lis`; do
     2570        ReadAllLink $f >> $MINDI_TMP/minimal.lis
    25702571    done
    25712572    # Initial / are trucated by tar
     
    25782579        fi
    25792580    done
    2580     tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
     2581    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
    25812582
    25822583    # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
    25832584    ln -sf /bin/bash bin/sh
    25842585    LogIt "INFO: Using bash as default shell"
    2585     rm -f $MINDI_TMP/minimal.lis
     2586    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
    25862587
    25872588    # Avoids an issue on some distro (RHEL5)
Note: See TracChangeset for help on using the changeset viewer.