Changeset 2874 in MondoRescue for branches/2.2.10/mondo

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/mondo/src

Files:

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

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);