Changeset 1592 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.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-tools.c (modified) (9 diffs)

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

@@ -13 +13 @@
 #include "mr_file.h"
 #include "mr_gettext.h"
+#include "mr_conf.h"
 
 #include "mondostructures.h"
@@ -36 +37 @@
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
+
+extern struct mr_ar_conf *mr_conf;
 
 /**
@@ -359 +362 @@
     long avm = 0;
     char *colon = NULL;
-    char *cdr_exe = NULL;
     char *tmp = NULL;
     char *call_before_iso_user = NULL;
@@ -450 +452 @@
     }
 
-// DVD
-
-    if (bkpinfo->backup_media_type == dvd) {
-        if (find_home_of_exe("growisofs")) {
-            mr_asprintf(&cdr_exe, "growisofs");
-        } else {
-            fatal_error("Please install growisofs.");
+// CD-R or CD-RW or DVD
+    if (bkpinfo->backup_media_type == cdrw
+        || bkpinfo->backup_media_type == dvd
+        || bkpinfo->backup_media_type == iso
+        || bkpinfo->backup_media_type == nfs
+        || bkpinfo->backup_media_type == cdr) {
+        if (!bkpinfo->manual_cd_tray) {
+            mr_strcat(extra_cdrom_params, "-waiti ");
+        }
+        if (bkpinfo->backup_media_type == cdrw) {
+            mr_strcat(extra_cdrom_params, "blank=fast ");
         }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, "%s -no-boot", mr_conf->iso_creation_opt);
         } else if
 #ifdef __FreeBSD__
@@ -468 +474 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s -b images/mindi-boot.2880.img -c boot.cat", mr_conf->iso_creation_opt);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
-    }
-#endif
-        else
-        {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+        mr_asprintf(&mondo_mkisofs_sz, "%s -b isolinux.bin -c boot.cat", mr_conf->iso_creation_opt);
+    }
+#endif
+        else {
+            mr_asprintf(&mondo_mkisofs_sz, "%s -b isolinux.bin -c boot.cat", mr_conf->iso_creation_opt);
         }
         if (bkpinfo->manual_cd_tray) {
-            fatal_error("Manual CD tray + DVD not supported yet.");
-            // -m isn't supported by growisofs, BTW...
-        } else {
-            sprintf(bkpinfo->call_make_iso,
-                    "%s %s -Z %s . 2>> _ERR_",
-                    mondo_mkisofs_sz, "", bkpinfo->media_device);
-        }
-        mr_free(mondo_mkisofs_sz);
-
-        if (getenv ("SUDO_COMMAND")) {
-            mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
-            if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
-                popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
-                fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
+            if (strstr(mr_conf->mondo_iso_burning_cmd,"growisofs") == NULL) {
+                fatal_error("Unable to use manual CD tray with growisofs");
             }
-            mr_free(command);
-        }
-        mr_msg(2, "call_make_iso (DVD res) is ... %s",
-                bkpinfo->call_make_iso);
-    }                           // end of DVD code
-
-// CD-R or CD-RW
-    if (bkpinfo->backup_media_type == cdrw
-        || bkpinfo->backup_media_type == cdr) {
-        if (!bkpinfo->manual_cd_tray) {
-            mr_strcat(extra_cdrom_params, "-waiti ");
-        }
-        if (bkpinfo->backup_media_type == cdrw) {
-            mr_strcat(extra_cdrom_params, "blank=fast ");
-        }
-        if (find_home_of_exe("cdrecord")) {
-            mr_asprintf(&cdr_exe, "cdrecord");
-        } else if (find_home_of_exe("dvdrecord")) {
-            mr_asprintf(&cdr_exe, "dvdrecord");
-        } else {
-            fatal_error("Please install either cdrecord or dvdrecord.");
-        }
-        if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
-        } else if
-#ifdef __FreeBSD__
-            (TRUE)
-#else
-            (bkpinfo->make_cd_use_lilo)
-#endif
-#ifdef __IA64__
-    {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
-    }
-#else
-    {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
-    }
-#endif
-        else
-        {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
-        }
-        if (bkpinfo->manual_cd_tray) {
             if (bkpinfo->call_before_iso[0] == '\0') {
-            sprintf(bkpinfo->call_before_iso,
-                        "%s -o %s/temporary.iso . 2>> _ERR_",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir);
+                sprintf(bkpinfo->call_before_iso,
+                        "%s %s -o %s/temporary.iso . 2>> %s",
+                        mr_conf->iso_creation_cmd,mondo_mkisofs_sz, bkpinfo->tmpdir, MONDO_LOGFILE);
             } else {
                 mr_asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
                 sprintf (bkpinfo->call_before_iso,
-                                    "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                                    "(%s %s -o %s/temporary.iso . 2>> %s ; %s )",
+                        mr_conf->iso_creation_cmd,mondo_mkisofs_sz, bkpinfo->tmpdir, MONDO_LOGFILE, call_before_iso_user);
                 mr_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
             sprintf(bkpinfo->call_make_iso,
-                    "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
-                    cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
-                    extra_cdrom_params, bkpinfo->media_device,
-                    bkpinfo->cdrw_speed, bkpinfo->tmpdir);
+                    "%s %s %s dev=%s speed=%d %s/temporary.iso",
+                    mr_conf->mondo_iso_burning_cmd,
+                    extra_cdrom_params, 
+                    mr_conf->mondo_iso_burning_opt, 
+                    bkpinfo->media_device,
+                    bkpinfo->cdrw_speed, 
+                    bkpinfo->tmpdir);
         } else {
-            sprintf(bkpinfo->call_make_iso,
-                    "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
-                    mondo_mkisofs_sz, cdr_exe,
-                    (bkpinfo->please_dont_eject) ? " " : "-eject",
-                    extra_cdrom_params, bkpinfo->media_device,
+            if (strstr(mr_conf->mondo_iso_burning_cmd,"growisofs") == NULL) {
+                if (getenv ("SUDO_COMMAND")) {
+                    mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
+                    if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
+                        fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
+                    }
+                    mr_free(command);
+                }
+                sprintf(bkpinfo->call_make_iso,
+                    "%s %s %s %s -Z %s -speed=%d . 2>> %s",
+                    mr_conf->mondo_iso_burning_cmd,
+                    mondo_mkisofs_sz, 
+                    extra_cdrom_params, 
+                    mr_conf->mondo_iso_burning_opt,
+                    bkpinfo->media_device,
+                    bkpinfo->cdrw_speed,
+                    MONDO_LOGFILE);
+            } else {
+                sprintf(bkpinfo->call_make_iso,
+                    "%s %s . 2>> %s | %s %s %s dev=%s speed=%d -",
+                    mr_conf->iso_creation_cmd,
+                    mondo_mkisofs_sz, 
+                    MONDO_LOGFILE,
+                    mr_conf->mondo_iso_burning_cmd,
+                    extra_cdrom_params, 
+                    mr_conf->mondo_iso_burning_opt,
+                    bkpinfo->media_device,
                     bkpinfo->cdrw_speed);
+            }
         }
         mr_free(mondo_mkisofs_sz);
-        mr_free(cdr_exe);
         mr_free(extra_cdrom_params);
     }                           // end of CD code
@@ -651 +625 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    mr_asprintf(&tmp, "%s", MONDO_TMPISOS);
-    if (does_file_exist(tmp)) {
-        unlink(tmp);
-    }
-    mr_free(tmp);
 
     if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
@@ -755 +724 @@
     bkpinfo->call_before_iso[0] = '\0';
     bkpinfo->call_make_iso[0] = '\0';
-    bkpinfo->call_burn_iso[0] = '\0';
     bkpinfo->call_after_iso[0] = '\0';
     bkpinfo->image_devs[0] = '\0';
@@ -810 +778 @@
  * - make sure user has enough free space in @c /
  * - check kernel for ramdisk support
- * - make sure afio, cdrecord, mkisofs, bzip2, awk, md5sum, strings, mindi, and buffer exist
+ * - make sure afio, cdrecord, bzip2, awk, md5sum, strings, mindi, and buffer exist
  * - make sure CD-ROM is unmounted
  * - make sure /etc/modules.conf exists
@@ -880 +848 @@
     }
 #endif
+    retval += whine_if_not_found(mr_conf->mr_iso_creation_cmd);
+    retval += whine_if_not_found(mr_conf->mondo_iso_burning_cmd);
     retval += whine_if_not_found(MKE2FS_OR_NEWFS);
-    retval += whine_if_not_found("mkisofs");
-    if (system("which dvdrecord > /dev/null 2> /dev/null")) {
-        retval += whine_if_not_found("cdrecord");
-    }
     retval += whine_if_not_found("bzip2");
     retval += whine_if_not_found("gzip");