Changeset 2933 in MondoRescue

Timestamp:

Jan 24, 2012, 7:09:40 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #578 by improving the regexp used for CD/DVD detection with -scanbus option
• Adds more verbosity when LVM creation fails.

Location:

branches/3.0/mondo/src

Files:

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

branches/3.0/mondo/src/common/libmondo-devices.c

@@ -559 +559 @@
     if (find_home_of_exe(cdr_exe)) {
         sprintf(command,
-                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
+                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep '[D|C][V|D]' | cut -d' ' -f2 | head -n1",
                 cdr_exe);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -916 +916 @@
 
     sprintf(tmp, "%s", call_program_and_get_last_line_of_output
-            ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
+            ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1")
         );
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         sprintf(tmp, "%s", call_program_and_get_last_line_of_output
-                ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
+                ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1")
             );
     if (tmp[0]) {

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

@@ -320 +320 @@
         res = run_program_and_log_output(command, 5);
         if (res > 0 && (p = strstr(command, "lvm "))) {
+            log_msg(0, "%s --> %d failed so removing lvm just in case", command, res);
             *p = *(p + 1) = *(p + 2) = ' ';
             res = run_program_and_log_output(command, 5);