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

Timestamp:

Sep 1, 2007, 12:07:44 AM (17 years ago)

Author:

Bruno Cornec

Message:

manual_cd_tray => manual_tray and usage of conf file for that field

File:

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

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

@@ -334 +334 @@
  * - Used: @c bkpinfo->prefix
  * - Used: @c bkpinfo->isodir
- * - Used: @c bkpinfo->manual_cd_tray
+ * - Used: @c bkpinfo->manual_tray
  * - Used: @c bkpinfo->make_cd_use_lilo
  * - Used: @c bkpinfo->media_device
@@ -458 +458 @@
         || bkpinfo->backup_media_type == nfs
         || bkpinfo->backup_media_type == cdr) {
-        if (!bkpinfo->manual_cd_tray) {
+        if (!bkpinfo->manual_tray) {
             mr_strcat(extra_cdrom_params, "-waiti ");
         }
@@ -484 +484 @@
             mr_asprintf(&mondo_mkisofs_sz, "%s -b isolinux.bin -c boot.cat", mr_conf->iso_creation_opt);
         }
-        if (bkpinfo->manual_cd_tray) {
+        if (bkpinfo->manual_tray) {
             if (strstr(mr_conf->iso_burning_cmd,"growisofs") != NULL) {
                 fatal_error("Unable to use manual CD tray with growisofs");
@@ -700 +700 @@
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
 
-    bkpinfo->manual_cd_tray = FALSE;
+    bkpinfo->manual_tray = mr_conf->manual_tray;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
     mr_asprintf(&tmp,mr_conf->media_device);