Changeset 1609 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable/mondo

Files:

• distributions/conf/mondo.conf.dist (modified) (1 diff)
• src/common/libmondo-archive.c (modified) (4 diffs)
• src/common/libmondo-devices.c (modified) (1 diff)
• src/common/libmondo-fork.c (modified) (2 diffs)
• src/common/libmondo-tools.c (modified) (4 diffs)
• src/common/libmondo-verify.c (modified) (2 diffs)
• src/common/mondostructures.h (modified) (1 diff)
• src/mondoarchive/mondo-cli.c (modified) (1 diff)

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -51 +51 @@
 # Default device of media
 #
-# Use /dev/hdc, /dev/sr0, /dev/st0, ATAPI:0,0,0, ...
+# Use /dev/hdc, /dev/sr0, /dev/st0, ...
 #
 mondo_media_device="/dev/hdc"

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

@@ -1567 +1567 @@
  * - @c call_make_iso
  * - @c make_cd_use_lilo
- * - @c manual_cd_tray
+ * - @c manual_tray
  * - @c nonbootable_backup
  * - @c scratchdir
@@ -1607 +1607 @@
     mr_free(tmp);
 
-    if (bkpinfo->backup_media_type != iso && bkpinfo->manual_cd_tray) {
+    if (bkpinfo->backup_media_type != iso && bkpinfo->manual_tray) {
         popup_and_OK(_("Please insert new media and press Enter."));
     }
@@ -3083 +3083 @@
  * - @c prefix
  * - @c isodir
- * - @c manual_cd_tray
+ * - @c manual_tray
  * - @c media_size
  * - @c nfs_mount
@@ -3185 +3185 @@
             {
                 mr_msg(3, "*Sigh* Mike, I hate your computer.");
-                bkpinfo->manual_cd_tray = TRUE;
+                bkpinfo->manual_tray = TRUE;
             }                   // if it can't be found then force pausing
             else {

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

@@ -1482 +1482 @@
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
                 if (ask_me_yes_or_no
-                    (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
+                    (_("Does your computer have a manual tray?")))
                 {
-                    bkpinfo->manual_cd_tray = TRUE;
+                    bkpinfo->manual_tray = TRUE;
                 }
             }

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

@@ -75 +75 @@
  * Call mkisofs to create an ISO image.
  * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->manual_cd_tray
+ * - @c bkpinfo->manual_tray
  * - @c bkpinfo->backup_media_type
  * - @c bkpinfo->please_dont_eject_when_restoring
@@ -134 +134 @@
     mr_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
-    if (bkpinfo->manual_cd_tray) {
+    if (bkpinfo->manual_tray) {
         /* Find everything after a 2>> and remove it */
         p = strstr(command, "2>>");

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);

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

@@ -902 +902 @@
  * - @c bkpinfo->isodir
  * - @c bkpinfo->prefix
- * - @c bkpinfo->manual_cd_tray
+ * - @c bkpinfo->manual_tray
  * - @c bkpinfo->media_device
  * - @c bkpinfo->nfs_remote_dir
@@ -946 +946 @@
         mr_free(tmp);
 
-        if (bkpinfo->manual_cd_tray) {
+        if (bkpinfo->manual_tray) {
             popup_and_OK(_("Please push CD tray closed."));
         }

branches/stable/mondo/src/common/mondostructures.h

@@ -576 +576 @@
    * it probably falls into this category.
    */
-    bool manual_cd_tray;
+    bool manual_tray;
 
   /**

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -593 +593 @@
     }
     if (flag_set['m']) {
-        bkpinfo->manual_cd_tray = TRUE;
+        bkpinfo->manual_tray = TRUE;
     }
     if (flag_set['k']) {