Changeset 1082


Ignore:
Timestamp:
Jan 29, 2007, 11:49:33 PM (12 years ago)
Author:
bruno
Message:
  • Fix to pb for mondo compilation
  • again improve usage of find in mindi
Location:
branches/stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1075 r1082  
    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
  • branches/stable/mondo/po/POTFILES.in

    r1057 r1082  
    1717src/include/mr_str.h
    1818src/include/mr_gettext.h
     19src/include/crcttt.h
    1920src/lib/mr_conf.c
    2021src/lib/mr_err.c
     
    2223src/lib/mr_str.c
    2324src/lib/mr_msg.c
    24 src/common/crcttt.h
    2525src/common/libmondo-mountlist.c
    2626src/common/libmondo-stream.h
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1080 r1082  
    832832    log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
    833833    for (i = 1; i < noof_chars; i++) {
    834             node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
    835         }
     834        node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
    836835        node = node->down;
    837836        char_to_add = string_to_add[i];
Note: See TracChangeset for help on using the changeset viewer.