Changeset 3014


Ignore:
Timestamp:
Jun 1, 2012, 3:10:35 PM (6 years ago)
Author:
bruno
Message:
  • Fix #617 and #615: Only non directtory are transferred to the rootfs by tar, in order to avoid linked dirs such as /lib to finish fully on it.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/mindi

    r3012 r3014  
    386386    elif [ -e "/etc/console/boottime.kmap.gz" ] ; then
    387387        LogFile "INFO: Debian-style config detected."
    388         echo -en "Adding the following keyboard mapping tables: "
     388        echo -en "INFO: Adding the following keyboard mapping tables: "
    389389        mkdir -p $bigdir/tmp
    390390        echo "/etc/console/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
     
    397397    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then
    398398        LogFile "INFO: Ubuntu-style config detected."
    399         echo -en "Adding the following keyboard mapping tables: "
     399        echo -en "INFO: Adding the following keyboard mapping tables: "
    400400        mkdir -p $bigdir/tmp
    401401        if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
     
    462462        return
    463463    fi
    464     echo -en "Adding the following keyboard mapping tables: "
     464    echo -en "INFO: Adding the following keyboard mapping tables: "
    465465    mkdir -p $bigdir/tmp
    466466    echo "$mappath" > $bigdir/tmp/KEYMAP-LIVES-HERE
     
    25262526    done
    25272527    # Initial / are trucated by tar
    2528     tar cf - `sort -u $MINDI_TMP/minimal.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
     2528    finallist=""
     2529    # Remove directories from the list, as tar will create them anyway
     2530    # and it may hurt if /lib is in it as on Debian/Ubuntu
     2531    for f in `sort -u $MINDI_TMP/minimal.lis`; do
     2532        if [ ! -d $f ]; then
     2533            finallist="$finallist $f"
     2534        fi
     2535    done
     2536    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
    25292537
    25302538    # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
     
    31643172
    31653173for i in loop cdrom ide-cd isofs linear raid0 raid1 raid5 ; do
    3166     modprobe $i 2>&1 > /dev/null
     3174    modinfo 2> /dev/null 1> /dev/null
     3175    if [ $? -eq 0 ]; then
     3176        modprobe $i 2>&1 > /dev/null
     3177    fi
    31673178done
    31683179
Note: See TracChangeset for help on using the changeset viewer.