Ignore:
Timestamp:
Apr 30, 2014, 12:30:11 PM (6 years ago)
Author:
Bruno Cornec
Message:
  • File KEYMAP-LIVES-HERE, USING-* not used anymore
  • Nomalize name usinf iso-dir and ISO-DIR where relevant
  • config entry netfs-server-path not used anymore (iso-dir instead when needed)
  • In network restore mode, also have the extended boot messages
  • Manages grub2 version string as grub 1 was
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

    r3271 r3278  
    267267        strcpy(bkpinfo->isodir, "/");
    268268    }
    269     if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
     269    // TODO: Are we shure it does what it's expected to do here ?
     270    if (does_file_exist("/tmp/NETFS-SERVER-MOUNT")) {
    270271        strcpy(isodir_device, last_line_of_file("/tmp/NETFS-SERVER-MOUNT"));
    271272        strcpy(isodir_format, "netfs");
    272         strcpy(bkpinfo->isodir, last_line_of_file("/tmp/NETFS-SERVER-PATH"));
     273        strcpy(bkpinfo->isodir, last_line_of_file("/tmp/ISO-DIR"));
    273274    }
    274275    if (nuke_me_please) {
     
    276277    }
    277278
    278     if (popup_and_get_string
    279         ("ISO Mode - device", "On what device do the ISO files live?",
    280          isodir_device, MAX_STR_LEN / 4)) {
    281         if (popup_and_get_string
    282             ("ISO Mode - format",
    283              "What is the disk format of the device? (Hit ENTER if you don't know.)",
    284              isodir_format, 16)) {
     279    if (popup_and_get_string("ISO Mode - device", "On what device do the ISO files live?", isodir_device, MAX_STR_LEN / 4)) {
     280        if (popup_and_get_string ("ISO Mode - format", "What is the disk format of the device? (Hit ENTER if you don't know.)", isodir_format, 16)) {
    285281            if (popup_with_buttons("Are you restoring from an external hard drive ?", "Yes", "No")) {
    286282                HDD = TRUE;
    287283            }
    288             if (popup_and_get_string
    289                 ("ISO Mode - path",
    290                 "At what path on this device can the ISO files be found ?",
    291                 bkpinfo->isodir, MAX_STR_LEN / 4)) {
     284            if (popup_and_get_string ("ISO Mode - path", "At what path on this device can the ISO files be found ?", bkpinfo->isodir, MAX_STR_LEN / 4)) {
    292285                strip_spaces(isodir_device);
    293286                strip_spaces(isodir_format);
     
    327320read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
    328321if (bkpinfo->disaster_recovery) {
    329     /* Patch Conor Daly 26-june-2004
    330     * Don't let this clobber an existing bkpinfo->isodir */
     322    /* Don't let this clobber an existing bkpinfo->isodir */
    331323    if (!bkpinfo->isodir[0]) {
    332324        strcpy(bkpinfo->isodir, "/tmp/isodir");
    333325    }
    334     /* End patch */
    335326    mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
    336327    run_program_and_log_output(command, 5);
     
    865856        mr_free(bkpinfo->netfs_mount);
    866857        mr_asprintf(bkpinfo->netfs_mount, "%s", value);
    867 
    868         read_cfg_var(cfg_file, "netfs-server-path", value);
     858        if (bkpinfo->netfs_mount != NULL) {
     859            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
     860        }
     861
     862        read_cfg_var(cfg_file, "iso-dir", value);
    869863        mr_free(bkpinfo->netfs_remote_dir);
    870864        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", value);
    871 
    872         if (bkpinfo->netfs_mount != NULL) {
    873             log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
    874         }
    875865        if (bkpinfo->netfs_remote_dir != NULL) {
    876866            log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
    877867        }
     868
    878869        if (bkpinfo->netfs_proto != NULL) {
    879870            log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
     
    907898    mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
    908899    read_cfg_var(cfg_file, "iso-mnt", iso_mnt);
    909     read_cfg_var(cfg_file, "isodir", iso_path);
     900    read_cfg_var(cfg_file, "iso-dir", iso_path);
    910901    sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
    911902    if (!bkpinfo->isodir[0]) {
Note: See TracChangeset for help on using the changeset viewer.