Changeset 2931


Ignore:
Timestamp:
Jan 24, 2012, 12:48:04 PM (5 years ago)
Author:
bruno
Message:
  • Really never inject or eject when the -e option is passed or device is inappropriate (USB, Net, ...)
Location:
branches/3.0/mondo/src/common
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mondo/src/common/libmondo-archive.c

    r2907 r2931  
    28302830
    28312831    if (!ok_go_ahead_burn_it) {
    2832         eject_device(cdrom_dev);
     2832        if (!bkpinfo->please_dont_eject) {
     2833            eject_device(cdrom_dev);
     2834        }
    28332835        mds = media_descriptor_string(g_backup_media_type);
    28342836        mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
     
    35313533        run_program_and_log_output("umount " MNT_CDROM, FALSE);
    35323534//    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)
    3533 //{
    3534         eject_device(bkpinfo->media_device);
    3535 //}
     3535        if (!bkpinfo->please_dont_eject) {
     3536            eject_device(bkpinfo->media_device);
     3537        }
    35363538    }
    35373539    mr_asprintf(&tmp, "%s/changed.files", MONDO_CACHE);
  • branches/3.0/mondo/src/common/libmondo-devices.c

    r2911 r2931  
    9595{
    9696//  log_it("rctada: Retracting all CD trays", __LINE__);
    97     if (strlen(g_cdrom_drive_is_here) > 0) {
    98         inject_device(g_cdrom_drive_is_here);
    99     }
    100     if (strlen(g_dvd_drive_is_here) > 0) {
    101         inject_device(g_dvd_drive_is_here);
    102     }
    103     if (strlen(g_cdrw_drive_is_here) > 0) {
    104         inject_device(g_cdrw_drive_is_here);
     97    if (!bkpinfo->please_dont_eject) {
     98        if (strlen(g_cdrom_drive_is_here) > 0) {
     99            inject_device(g_cdrom_drive_is_here);
     100        }
     101        if (strlen(g_dvd_drive_is_here) > 0) {
     102            inject_device(g_dvd_drive_is_here);
     103        }
     104        if (strlen(g_cdrw_drive_is_here) > 0) {
     105            inject_device(g_cdrw_drive_is_here);
     106        }
    105107    }
    106108//  log_it("rctada: killing autorun");
     
    30183020    }
    30193021//  assert_string_is_neither_NULL_nor_zerolength(dev);
    3020     log_msg(10, "Injecting %s", dev);
    3021     inject_device(dev);
     3022    if (!bkpinfo->please_dont_eject) {
     3023        log_msg(10, "Injecting %s", dev);
     3024        inject_device(dev);
     3025    }
    30223026    if (!does_file_exist(dev)) {
    30233027        log_msg(10, "%s doesn't exist. Returning FALSE.", dev);
  • branches/3.0/mondo/src/common/libmondo-fork.c

    r2700 r2931  
    7979 * - @c bkpinfo->manual_cd_tray
    8080 * - @c bkpinfo->backup_media_type
    81  * - @c bkpinfo->please_dont_eject_when_restoring
    8281 * @param basic_call The call to mkisofs. May contain tokens that will be resolved to actual data. The tokens are:
    8382 * - @c _ISO_ will become the ISO file (@p isofile)
Note: See TracChangeset for help on using the changeset viewer.