Ignore:
Timestamp:
Sep 22, 2006, 11:12:37 PM (13 years ago)
Author:
bruno
Message:

merge -r793:807 $SVN_M/branches/stable
src => common for the moment it's easier to manage merges

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r794 r808  
    851851                paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
    852852            }
     853            /* We need to override prefix value in PXE mode as it's
     854             * already done in start-nfs */
     855            if (strstr(call_program_and_get_last_line_of_output
     856               ("cat /proc/cmdline"), "pxe")) {
     857                    strcpy(bkpinfo->prefix,getenv("imgname"));
     858            }
     859
    853860        } else if (!strcmp(value, "tape")) {
    854861            bkpinfo->backup_media_type = tape;
     
    975982            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
    976983        }
     984        /* We need to override values in PXE mode as it's
     985         * already done in start-nfs */
     986        if (strstr(call_program_and_get_last_line_of_output
     987           ("cat /proc/cmdline"), "pxe")) {
     988                strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));
     989                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
     990            }
    977991    } else if (bkpinfo->backup_media_type == iso) {
    978992        /* Patch by Conor Daly 23-june-2004
     
    10371051                    } else {
    10381052                        log_msg(1,
    1039                                 "You backed up to disk, then burned some CDs. Naughty monkey!");
     1053                                "You backed up to disk, then burned some CDs.");
    10401054                    }
    10411055                }
     
    23852399
    23862400    assert(wait_for_percentage <= 100);
    2387     iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
     2401    iamhere("wait_until_software_raids_are_prepped");
    23882402    while (unfinished_mdstat_devices > 0) {
    23892403        if (parse_mdstat(raidlist, "/dev/")) {
Note: See TracChangeset for help on using the changeset viewer.