Changeset 914 in MondoRescue for trunk/mondo/src/common/libmondo-archive.c

Timestamp:

Nov 2, 2006, 2:00:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r902:913 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-archive.c (modified) (8 diffs)

trunk/mondo/src/common/libmondo-archive.c

@@ -568 +568 @@
 
     mr_asprintf(&tmp,
-             "echo '%s' | tr -s ' ' '\n' | grep -x '/dev/.*' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
+             "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
              bkpinfo->exclude_paths);
     devs_to_exclude = call_program_and_get_last_line_of_output(tmp);
@@ -1741 +1741 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                mr_asprintf(&sz_blank_disk, "dvd+rw-format %s",
+                mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s",
                          bkpinfo->media_device);
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
@@ -1805 +1805 @@
 // FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
             res = eval_call_to_make_ISO(bkpinfo,
-                                        "mkisofs -o _ISO_ -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                        "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                         destfile, g_current_media_number,
                                         MONDO_LOGFILE, message_to_screen);
@@ -1824 +1824 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                mr_asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
+                mr_asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
                                             tmp2,
@@ -1837 +1837 @@
                 log_msg(1, "Non-ia64 --> lilo");
                 res = eval_call_to_make_ISO(bkpinfo,
-                                            "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                            "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                             destfile,
                                             g_current_media_number,
@@ -1847 +1847 @@
                 log_msg(1, "Isolinux");
                 res = eval_call_to_make_ISO(bkpinfo,
-                                            "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                            "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                             destfile,
                                             g_current_media_number,
@@ -3619 +3619 @@
         }
         mr_asprintf(&tmp,
-                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
+                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);
@@ -3625 +3625 @@
 
         mr_asprintf(&tmp,
-                 "grep 'star: ' %s | sed 's/star: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
+                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);