Changeset 1592 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 9, 2007, 3:19:05 PM (17 years ago)

Author:

Bruno Cornec

Message:

• use of conf file for mkisofs and cdrecord commands
• unification of cdr,cdrw and dvd
• may not compile, modifications will continue

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (5 diffs)

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

@@ -20 +20 @@
 #include "mondostructures.h"
 
-#include "mr_conf.h"
 #include "mr_mem.h"
 #include "mr_msg.h"
@@ -41 +40 @@
 
 #define DVDRWFORMAT 1
-
-extern struct mr_ar_conf *mr_conf;
 
 #ifndef __FreeBSD__
@@ -1659 +1656 @@
             } else {
                 log_to_screen("%s...OK", message_to_screen);
-                sprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
+                mr_asprintf(&tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
                 if (!run_program_and_log_output(tmp, 1)) {
                     log_to_screen
                         ("Despite nonfatal errors, growisofs confirms the write was successful.");
                 }
+                mr_free(tmp);
             }
             retval += res;
@@ -1738 +1736 @@
         mr_free(message_to_screen);
     } else {
-        mr_asprintf(&message_to_screen, "Running %s to make %s #%d",
-                mr_conf->iso_creation_cmd,
-                bkpinfo->backup_media_string,
-                g_current_media_number);
-        mr_msg(1, message_to_screen);
-        mr_asprintf(&result_sz, "Call to %s to make ISO (%s #%d) ",
-                mr_conf->iso_creation_cmd,
-                bkpinfo->backup_media_string,
-                g_current_media_number);
-        if (bkpinfo->nonbootable_backup) {
-            mr_msg(1, "Making nonbootable backup");
-            res = eval_call_to_make_ISO(bkpinfo,
-                                        "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);
-        } else {
-            mr_msg(1, "Making bootable backup");
-
-#ifdef __FreeBSD__
-            bkpinfo->make_cd_use_lilo = TRUE;
-#endif
-
-
-            mr_msg(1, "make_cd_use_lilo is actually %d",
-                    bkpinfo->make_cd_use_lilo);
-            if (bkpinfo->make_cd_use_lilo) {
-                mr_msg(1, "make_cd_use_lilo = TRUE");
-// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
-// and add ' .' at end
-#ifdef __IA64__
-                mr_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO(bkpinfo,
-                                            //-b images/mindi-boot.2880.img
-                                            "mkisofs -no-emul-boot -b images/mindi-bootroot."
-                                            IA64_BOOT_SIZE
-                                            ".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,
-                                            MONDO_LOGFILE,
-                                            message_to_screen);
-#else
-// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
-// and add ' .' at end
-                mr_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#_ .",
-                                            destfile,
-                                            g_current_media_number,
-                                            MONDO_LOGFILE,
-                                            message_to_screen);
-#endif
-            } else {
-                mr_msg(1, "make_cd_use_lilo = FALSE");
-                mr_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#_ .",
-                                            destfile,
-                                            g_current_media_number,
-                                            MONDO_LOGFILE,
-                                            message_to_screen);
-            }
-        }
-        mr_free(message_to_screen);
-        if (res) {
-            log_to_screen("%s...failed", result_sz);
-        } else {
-            log_to_screen("%s...OK", result_sz);
-        }
-        retval += res;
-        mr_free(result_sz);
+        fatal_error("call_make_iso undefined. Not normal in this case");
     }
 
@@ -1820 +1749 @@
             mr_free(tmp);
         }
-    }
-
-    if (bkpinfo->call_burn_iso[0] != '\0') {
-        mr_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
-        mr_asprintf(&message_to_screen, "Burning %s #%d",
-                 bkpinfo->backup_media_string,
-                 g_current_media_number);
-        pause_and_ask_for_cdr(2, &cd_is_mountable);
-        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_burn_iso,
-                                    destfile, g_current_media_number,
-                                    MONDO_LOGFILE, message_to_screen);
-        if (res) {
-            log_to_screen("%s...failed", message_to_screen);
-        } else {
-            log_to_screen("%s...OK", message_to_screen);
-        }
-        mr_free(message_to_screen);
-        retval += res;
     }