Changeset 1085 for trunk


Ignore:
Timestamp:
Jan 30, 2007, 11:06:16 AM (13 years ago)
Author:
bruno
Message:

merge -r1081:1082 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r1079 r1085  
    577577    AddKeyboardMappingFile $mappath
    578578    echo -e "$DONE"
     579    rm -f $MINDI_TMP/keymaps.find
    579580    return 0
    580581}
     
    976977    fi
    977978    output=""
    978     #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /lib /lib64 /usr/local/lib /usr/local/lib64 /usr/X11R6/lib /usr/X11R6/lib64 `find /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d` ; do
    979979    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
    980980        [ ! -d "$path" ] && continue
     
    15051505    [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
    15061506    [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
    1507     i=`find $imagesdir -type f | grep -F "/mindi-root.1" 2> /dev/null`
    1508     j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev '2880|5760'`
     1507    find $imagesdir -type f > $MINDI_TMP/imagesdir.files
     1508    i=`grep -F "/mindi-root.1" $MINDI_TMP/imagesdir.files 2> /dev/null`
     1509    j=`grep -F "/mindi-boot" $MINDI_TMP/imagesdir.files | grep -Ev '2880|5760'`
    15091510    if [ "$i" ] ; then
    15101511        CopyImageToDisk $j $data_dev "boot disk"
     
    15141515    fi
    15151516    count=1
    1516     for i in `find $imagesdir | grep -F mindi-data` ; do
     1517    for i in `grep -F mindi-data $MINDI_TMP/imagesdir.files` ; do
    15171518        CopyImageToDisk $i $data_dev "data disk #$count"
    15181519        count=$(($count+1))
    15191520    done
     1521    rm -f $MINDI_TMP/imagesdir.files
    15201522}
    15211523
Note: See TracChangeset for help on using the changeset viewer.