Changeset 2874 in MondoRescue for branches

Timestamp:

Sep 29, 2011, 8:37:54 PM (13 years ago)

Author:

Bruno Cornec

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:

• mindi/mindi (modified) (4 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (2 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)

branches/2.2.10/mindi/mindi

@@ -221 +221 @@
     fi
 
+    # TODO: Why that
     mkdir -p $bigdir/etc
+    # TODO: why not use the cp.lis here ?
     tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
@@ -230 +232 @@
     for included_item in $included_list ; do
         if [ ! -e "$included_item" ] ; then
-                sss=`grep -F "${included_item}.inc" $MINDI_TMP/keymaps.find`
+            sss=`grep -F "${included_item}.inc" $MINDI_TMP/keymaps.find`
             [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find`
             for ii in $sss ; do
@@ -2240 +2242 @@
 
     # Get kbd conf from data disk preparation
-    echo $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis
+    cat $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis
     # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
     if [ -h "/lib64" ]; then
@@ -2281 +2283 @@
             # and potentially their symlink structure and their deps
             mountlis=`grep -Ev "^#" $MINDI_CONF/udev.files`
+            if [ -x /etc/init.d/functions ]; then
+                mountlis="$mountlis /etc/init.d/functions"
+            fi
             ReadAllLink $mountlis | sort -u >> $MINDI_TMP/udev.lis
             LocateDeps `cat $MINDI_TMP/udev.lis` | sort -u >> $MINDI_TMP/cp.lis

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -1347 +1347 @@
         }
     }
-    mr_asprintf(&find_excludes, "|");
+    mr_asprintf(find_excludes, "|");
 
     if (!depth) {
@@ -1440 +1440 @@
             }
             mr_free(new_with_pipe);
-            mr_asprintf(new_with_spaces, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -1224 +1224 @@
         newtComponent b2;
         newtComponent b3;
-        //newtComponent b4;
+        newtComponent b4;
         newtComponent b5;
         newtComponent b_res;
@@ -1236 +1236 @@
         b2 = newtButton(18, 1, "gzip");
         b3 = newtButton(4, 5, "lzo");
-        //b4 = newtButton(18, 5, "lzma");
+        b4 = newtButton(18, 5, "lzma");
         b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -838 +838 @@
                         "Using tune2fs to identify your ext2,3 partitions");
 
-    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);