Changeset 1916


Ignore:
Timestamp:
Apr 17, 2008, 1:14:29 AM (11 years ago)
Author:
bruno
Message:

Apply patch mondo.live-nfs.patch (Mark Pinkerton <Mark.Pinkerton_at_emageon.com>)

Location:
branches/2.2.6/mondo/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.6/mondo/src/common/libmondo-devices.c

    r1885 r1916  
    273273 */
    274274bool g_restoring_live_from_cd = FALSE;
     275bool g_restoring_live_from_nfs = FALSE;
    275276
    276277extern t_bkptype g_backup_media_type;   // set by main()
  • branches/2.2.6/mondo/src/mondorestore/mondo-restore.c

    r1913 r1916  
    926926
    927927    strcpy(bkpinfo->restore_path, "/");
    928     if (!g_restoring_live_from_cd) {
     928    if (!g_restoring_live_from_cd && !g_restoring_live_from_nfs) {
    929929        popup_and_OK
    930930            ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
    931931        sleep(1);
    932932    }
    933     interactively_obtain_media_parameters_from_user(FALSE);
     933    if (!g_restoring_live_from_nfs) {
     934        interactively_obtain_media_parameters_from_user(FALSE);
     935    }
    934936    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
    935937    if (!bkpinfo->media_device[0]) {
     
    949951    retval = load_mountlist(mountlist, g_mountlist_fname);
    950952    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
    951     filelist = process_filelist_and_biggielist();
    952     if (filelist) {
     953
     954    if (!g_restoring_live_from_nfs && (filelist = process_filelist_and_biggielist())) {
    953955        save_filelist(filelist, "/tmp/selected-files.txt");
    954956        strcpy(old_restpath, bkpinfo->restore_path);
     
    964966        }
    965967        strcpy(bkpinfo->restore_path, old_restpath);
     968    } else {
     969        retval += restore_everything(NULL);
    966970    }
    967971    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
     
    31433147            g_restoring_live_from_cd = TRUE;
    31443148        }
     3149        if (bkpinfo->backup_media_type == nfs) {
     3150            g_restoring_live_from_nfs = TRUE;
     3151        }
    31453152        if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
    31463153            retval =
  • branches/2.2.6/mondo/src/mondorestore/mr-externs.h

    r1647 r1916  
    108108extern bool g_text_mode;
    109109extern bool g_restoring_live_from_cd;
     110extern bool g_restoring_live_from_nfs;
    110111extern int fput_string_one_char_at_a_time(FILE *, char *);
    111112
Note: See TracChangeset for help on using the changeset viewer.