Changeset 1609 for branches/stable


Ignore:
Timestamp:
Sep 1, 2007, 12:07:44 AM (12 years ago)
Author:
bruno
Message:

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

Location:
branches/stable/mondo
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/distributions/conf/mondo.conf.dist

    r1594 r1609  
    5151# Default device of media
    5252#
    53 # Use /dev/hdc, /dev/sr0, /dev/st0, ATAPI:0,0,0, ...
     53# Use /dev/hdc, /dev/sr0, /dev/st0, ...
    5454#
    5555mondo_media_device="/dev/hdc"
  • branches/stable/mondo/src/common/libmondo-archive.c

    r1594 r1609  
    15671567 * - @c call_make_iso
    15681568 * - @c make_cd_use_lilo
    1569  * - @c manual_cd_tray
     1569 * - @c manual_tray
    15701570 * - @c nonbootable_backup
    15711571 * - @c scratchdir
     
    16071607    mr_free(tmp);
    16081608
    1609     if (bkpinfo->backup_media_type != iso && bkpinfo->manual_cd_tray) {
     1609    if (bkpinfo->backup_media_type != iso && bkpinfo->manual_tray) {
    16101610        popup_and_OK(_("Please insert new media and press Enter."));
    16111611    }
     
    30833083 * - @c prefix
    30843084 * - @c isodir
    3085  * - @c manual_cd_tray
     3085 * - @c manual_tray
    30863086 * - @c media_size
    30873087 * - @c nfs_mount
     
    31853185            {
    31863186                mr_msg(3, "*Sigh* Mike, I hate your computer.");
    3187                 bkpinfo->manual_cd_tray = TRUE;
     3187                bkpinfo->manual_tray = TRUE;
    31883188            }                   // if it can't be found then force pausing
    31893189            else {
  • branches/stable/mondo/src/common/libmondo-devices.c

    r1594 r1609  
    14821482            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
    14831483                if (ask_me_yes_or_no
    1484                     (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
     1484                    (_("Does your computer have a manual tray?")))
    14851485                {
    1486                     bkpinfo->manual_cd_tray = TRUE;
     1486                    bkpinfo->manual_tray = TRUE;
    14871487                }
    14881488            }
  • branches/stable/mondo/src/common/libmondo-fork.c

    r1594 r1609  
    7575 * Call mkisofs to create an ISO image.
    7676 * @param bkpinfo The backup information structure. Fields used:
    77  * - @c bkpinfo->manual_cd_tray
     77 * - @c bkpinfo->manual_tray
    7878 * - @c bkpinfo->backup_media_type
    7979 * - @c bkpinfo->please_dont_eject_when_restoring
     
    134134    mr_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
    135135            what_i_am_doing);
    136     if (bkpinfo->manual_cd_tray) {
     136    if (bkpinfo->manual_tray) {
    137137        /* Find everything after a 2>> and remove it */
    138138        p = strstr(command, "2>>");
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1594 r1609  
    334334 * - Used: @c bkpinfo->prefix
    335335 * - Used: @c bkpinfo->isodir
    336  * - Used: @c bkpinfo->manual_cd_tray
     336 * - Used: @c bkpinfo->manual_tray
    337337 * - Used: @c bkpinfo->make_cd_use_lilo
    338338 * - Used: @c bkpinfo->media_device
     
    458458        || bkpinfo->backup_media_type == nfs
    459459        || bkpinfo->backup_media_type == cdr) {
    460         if (!bkpinfo->manual_cd_tray) {
     460        if (!bkpinfo->manual_tray) {
    461461            mr_strcat(extra_cdrom_params, "-waiti ");
    462462        }
     
    484484            mr_asprintf(&mondo_mkisofs_sz, "%s -b isolinux.bin -c boot.cat", mr_conf->iso_creation_opt);
    485485        }
    486         if (bkpinfo->manual_cd_tray) {
     486        if (bkpinfo->manual_tray) {
    487487            if (strstr(mr_conf->iso_burning_cmd,"growisofs") != NULL) {
    488488                fatal_error("Unable to use manual CD tray with growisofs");
     
    700700    memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
    701701
    702     bkpinfo->manual_cd_tray = FALSE;
     702    bkpinfo->manual_tray = mr_conf->manual_tray;
    703703    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
    704704    mr_asprintf(&tmp,mr_conf->media_device);
  • branches/stable/mondo/src/common/libmondo-verify.c

    r1549 r1609  
    902902 * - @c bkpinfo->isodir
    903903 * - @c bkpinfo->prefix
    904  * - @c bkpinfo->manual_cd_tray
     904 * - @c bkpinfo->manual_tray
    905905 * - @c bkpinfo->media_device
    906906 * - @c bkpinfo->nfs_remote_dir
     
    946946        mr_free(tmp);
    947947
    948         if (bkpinfo->manual_cd_tray) {
     948        if (bkpinfo->manual_tray) {
    949949            popup_and_OK(_("Please push CD tray closed."));
    950950        }
  • branches/stable/mondo/src/common/mondostructures.h

    r1594 r1609  
    576576   * it probably falls into this category.
    577577   */
    578     bool manual_cd_tray;
     578    bool manual_tray;
    579579
    580580  /**
  • branches/stable/mondo/src/mondoarchive/mondo-cli.c

    r1594 r1609  
    593593    }
    594594    if (flag_set['m']) {
    595         bkpinfo->manual_cd_tray = TRUE;
     595        bkpinfo->manual_tray = TRUE;
    596596    }
    597597    if (flag_set['k']) {
Note: See TracChangeset for help on using the changeset viewer.