Ignore:
Timestamp:
Oct 30, 2007, 1:45:03 AM (12 years ago)
Author:
Bruno Cornec
Message:
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

    r1653 r1736  
    430430    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
    431431    iamhere("Done loading config file; resizing ML");
    432     strcpy(tmp, bkpinfo->prefix);
    433     if (popup_and_get_string
    434         ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
    435         strcpy(bkpinfo->prefix, tmp);
    436         log_msg(1, "Prefix set to %s",bkpinfo->prefix);
     432    if (bkpinfo->backup_media_type != usb) {
     433        strcpy(tmp, bkpinfo->prefix);
     434        if (popup_and_get_string
     435            ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
     436            strcpy(bkpinfo->prefix, tmp);
     437            log_msg(1, "Prefix set to %s",bkpinfo->prefix);
     438        }
    437439    }
    438440   
     
    864866    if (retval) {
    865867        log_to_screen("Errors occurred during the nuke phase.");
    866     } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
    867     {
     868    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) {
    868869        log_to_screen
    869870            ("PC was restored successfully. Thank you for using Mondo Rescue.");
     
    927928    if (!g_restoring_live_from_cd) {
    928929        popup_and_OK
    929             ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
     930            ("Please insert tape/CD/USB Key/boot floppy, then hit 'OK' to continue.");
    930931        sleep(1);
    931932    }
     
    26582659    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
    26592660    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    2660         mount_cdrom();
     2661        mount_media();
    26612662        mvaddstr_and_log_it(g_currentY++, 0,
    26622663                            "Restoring OS and data from streaming media");
     
    26762677    } else {
    26772678        mvaddstr_and_log_it(g_currentY++, 0,
    2678                             "Restoring OS and data from CD       ");
    2679         mount_cdrom();
     2679                            "Restoring OS and data from CD/USB   ");
     2680        mount_media();
    26802681        resA = restore_all_tarballs_from_CD(filelist);
    26812682        resB = restore_all_biggiefiles_from_CD(filelist);
Note: See TracChangeset for help on using the changeset viewer.