Changeset 2481 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Nov 12, 2009, 2:33:39 AM (14 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)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

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"))) {