Changeset 2481 in MondoRescue for branches/2.2.10/mondo/src

Timestamp:

Nov 12, 2009, 2:33:39 AM (16 years ago)

Author:

Bruno Cornec

Message:

• If using nolvm, mondorestore should also not analyze and handle i-want-my-lvm
• Add support for diskdumplib driver useful for RHEL 3 and IBM xseries 336
• Fix #367 - the for loop doesn't make any test now, as it was computed before entering the loop, leading to a

n error, and was also made inside the loop anyway.

• Adds a nolvm boot option at restore time
• small improvement for loging in USB case

(merge from 2.2.9 2475:2480)

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (2 diffs)
• mondorestore/mondo-prep.c (modified) (1 diff)

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

@@ -2042 +2042 @@
                        get_last_filelist_number() + 1);
 
-    for (; does_file_exist(curr_filelist_fname); curr_set_no++) {
+    for (;;) {
         /* backup this set of files */
         mr_asprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
@@ -2123 +2123 @@
         mr_free(curr_filelist_fname);
         mr_free(curr_afioball_fname);
+        curr_set_no++;
     }
     close_progress_form();

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

@@ -213 +213 @@
     return (0);
 #endif
+
+    tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
+    if (strstr(tmp, "nolvm")) {
+        mr_free(tmp);
+        return(0);
+    }
+    mr_free(tmp);
 
     if (!(fin = fopen("/tmp/i-want-my-lvm", "r"))) {