Changeset 1594 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.c

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

File:

• branches/stable/mondo/src/common/libmondo-tools.c (modified) (7 diffs)

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

@@ -329 +329 @@
  * - Used: @c bkpinfo->backup_data
  * - Used: @c bkpinfo->backup_media_type
- * - Used: @c bkpinfo->cdrw_speed
+ * - Used: @c bkpinfo->writer_speed
  * - Used: @c bkpinfo->compression_level
  * - Used: @c bkpinfo->include_paths
@@ -485 +485 @@
         }
         if (bkpinfo->manual_cd_tray) {
-            if (strstr(mr_conf->mondo_iso_burning_cmd,"growisofs") == NULL) {
+            if (strstr(mr_conf->iso_burning_cmd,"growisofs") != NULL) {
                 fatal_error("Unable to use manual CD tray with growisofs");
             }
@@ -502 +502 @@
             sprintf(bkpinfo->call_make_iso,
                     "%s %s %s dev=%s speed=%d %s/temporary.iso",
-                    mr_conf->mondo_iso_burning_cmd,
+                    mr_conf->iso_burning_cmd,
                     extra_cdrom_params, 
-                    mr_conf->mondo_iso_burning_opt, 
-                    bkpinfo->media_device,
-                    bkpinfo->cdrw_speed, 
+                    mr_conf->iso_burning_opt, 
+                    bkpinfo->iso_burning_dev,
+                    bkpinfo->writer_speed, 
                     bkpinfo->tmpdir);
         } else {
-            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.");
+            if (bkpinfo->backup_media_type == iso) {
+                sprintf(bkpinfo->call_make_iso,
+                    "%s %s . 2>> %s",
+                        mr_conf->iso_creation_cmd,
+                        mondo_mkisofs_sz, 
+                        MONDO_LOGFILE);
+            } else {
+                if (strstr(mr_conf->iso_burning_cmd,"growisofs") != NULL) {
+                    if (getenv ("SUDO_COMMAND")) {
+                        mr_asprintf(&command, "strings %s | grep -c SUDO_COMMAND", mr_conf->iso_burning_cmd);
+                        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);
                     }
-                    mr_free(command);
+                    sprintf(bkpinfo->call_make_iso,
+                        "%s %s %s %s -Z %s -speed=%d . 2>> %s",
+                        mr_conf->iso_burning_cmd,
+                        mondo_mkisofs_sz, 
+                        extra_cdrom_params, 
+                        mr_conf->iso_burning_opt,
+                        bkpinfo->iso_burning_dev,
+                        bkpinfo->writer_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->iso_burning_cmd,
+                        extra_cdrom_params, 
+                        mr_conf->iso_burning_opt,
+                        bkpinfo->iso_burning_dev,
+                        bkpinfo->writer_speed);
                 }
-                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(extra_cdrom_params);
             }
         }
-        mr_free(mondo_mkisofs_sz);
-        mr_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -684 +692 @@
 void reset_bkpinfo(struct s_bkpinfo *bkpinfo)
 {
+    char *tmp = NULL;
+
     mr_msg(1, "Hi");
 
@@ -692 +702 @@
     bkpinfo->manual_cd_tray = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-    bkpinfo->media_device[0] = '\0';
-    bkpinfo->media_size = 0L;
+    mr_asprintf(&tmp,mr_conf->media_device);
+    bkpinfo->media_device = tmp;
+    mr_asprintf(&tmp,mr_conf->iso_burning_dev);
+    bkpinfo->iso_burning_dev = tmp;
+
+    bkpinfo->media_size = mr_conf->iso_burning_speed;
     bkpinfo->boot_loader = '\0';
     bkpinfo->boot_device[0] = '\0';
@@ -732 +746 @@
     bkpinfo->wipe_media_first = FALSE;
     bkpinfo->differential = FALSE;
-    bkpinfo->cdrw_speed = 0;
+    bkpinfo->writer_speed = mr_conf->iso_burning_speed;
 // patch by Herman Kuster  
     bkpinfo->differential = 0;
@@ -848 +862 @@
     }
 #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(mr_conf->iso_creation_cmd);
+    retval += whine_if_not_found(mr_conf->iso_burning_cmd);
     retval += whine_if_not_found(MKE2FS_OR_NEWFS);
     retval += whine_if_not_found("bzip2");