Changeset 2874


Ignore:
Timestamp:
Sep 29, 2011, 8:37:54 PM (8 years ago)
Author:
bruno
Message:

r4323@mzielinski: bruno | 2011-09-29 20:26:04 +0200

  • Various 2.2.10 fixes for lzma support and some mindi improvements
Location:
branches/2.2.10
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/mindi

    r2873 r2874  
    221221    fi
    222222
     223    # TODO: Why that
    223224    mkdir -p $bigdir/etc
     225    # TODO: why not use the cp.lis here ?
    224226    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
    225227    if [ "`echo $mappath | grep -F ".gz"`" ] ; then
     
    230232    for included_item in $included_list ; do
    231233        if [ ! -e "$included_item" ] ; then
    232                 sss=`grep -F "${included_item}.inc" $MINDI_TMP/keymaps.find`
     234            sss=`grep -F "${included_item}.inc" $MINDI_TMP/keymaps.find`
    233235            [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find`
    234236            for ii in $sss ; do
     
    22402242
    22412243    # Get kbd conf from data disk preparation
    2242     echo $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis
     2244    cat $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis
    22432245    # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
    22442246    if [ -h "/lib64" ]; then
     
    22812283            # and potentially their symlink structure and their deps
    22822284            mountlis=`grep -Ev "^#" $MINDI_CONF/udev.files`
     2285            if [ -x /etc/init.d/functions ]; then
     2286                mountlis="$mountlis /etc/init.d/functions"
     2287            fi
    22832288            ReadAllLink $mountlis | sort -u >> $MINDI_TMP/udev.lis
    22842289            LocateDeps `cat $MINDI_TMP/udev.lis` | sort -u >> $MINDI_TMP/cp.lis
  • branches/2.2.10/mondo/src/common/libmondo-filelist.c

    r2850 r2874  
    13471347        }
    13481348    }
    1349     mr_asprintf(&find_excludes, "|");
     1349    mr_asprintf(find_excludes, "|");
    13501350
    13511351    if (!depth) {
     
    14401440            }
    14411441            mr_free(new_with_pipe);
    1442             mr_asprintf(new_with_spaces, "|%s|", new);
    14431442            if (strstr(skip_these, new_with_pipe)) {
    14441443                fprintf(fout, "%s\n", new);
  • branches/2.2.10/mondo/src/common/newt-specific.c

    r2816 r2874  
    12241224        newtComponent b2;
    12251225        newtComponent b3;
    1226         //newtComponent b4;
     1226        newtComponent b4;
    12271227        newtComponent b5;
    12281228        newtComponent b_res;
     
    12361236        b2 = newtButton(18, 1, "gzip");
    12371237        b3 = newtButton(4, 5, "lzo");
    1238         //b4 = newtButton(18, 5, "lzma");
     1238        b4 = newtButton(18, 5, "lzma");
    12391239        b5 = newtButton(4, 9, "         Exit        ");
    12401240        myForm = newtForm(NULL, NULL, 0);
  • branches/2.2.10/mondo/src/mondorestore/mondorestore.c

    r2850 r2874  
    838838                        "Using tune2fs to identify your ext2,3 partitions");
    839839
    840     mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);
     840    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
    841841    res = run_program_and_log_output(tmp, TRUE);
    842842    mr_free(tmp);
Note: See TracChangeset for help on using the changeset viewer.