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/common/libmondo-tools.c

    r3268 r3278  
    351351    char *mondo_mkisofs_sz = NULL;
    352352    char *command = NULL;
    353     char *hostname = NULL;
    354353    char *isofs_cmd = NULL;
    355     char *ip_address = NULL;
    356354    int retval = 0;
    357     char *colon;
    358355    char *cdr_exe = NULL;
    359356    char *tmp = NULL;
     
    362359    char *iso_mnt = NULL;
    363360    char *iso_tmp = NULL;
    364     char *iso_path = NULL;
    365     char *cfg_fname = NULL;
     361    char *iso_dir = NULL;
    366362
    367363    assert(bkpinfo != NULL);
     
    532528    if (bkpinfo->backup_media_type == iso) {
    533529
    534 /* Patch by Conor Daly <conor.daly@met.ie>
    535  * 23-june-2004
    536  * Break up isodir into iso_mnt and iso_path
     530/* Break up isodir into iso_mnt and iso_dir
    537531 * These will be used along with iso-dev at restore time
    538532 * to locate the ISOs where ever they're mounted
     
    560554        mr_free(command);
    561555
    562         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
     556        log_it("iso_mnt: %s, %d", iso_mnt, strlen(iso_mnt));
    563557        mr_asprintf(iso_tmp, "%s", bkpinfo->isodir);
    564558        if (strlen(iso_tmp) < strlen(iso_mnt)) {
    565             mr_asprintf(iso_path, "%s", "");
     559            mr_asprintf(iso_dir, "%s", "");
    566560        } else {
    567             // If iso_mnt is only / then iso_path is the full dir
     561            // If iso_mnt is only / then iso_dir is the full dir
    568562            // (the formula bellow doesn't work in this case)
    569563            if (strcmp(iso_mnt, "/") == 0) {
    570                 mr_asprintf(iso_path, "%s", iso_tmp);
     564                mr_asprintf(iso_dir, "%s", iso_tmp);
    571565            // else it's a part of iso_tmp
    572566            } else {
    573                 mr_asprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
     567                mr_asprintf(iso_dir, "%s", iso_tmp + strlen(iso_mnt));
    574568            }
    575569        }
     
    577571        mr_free(iso_tmp);
    578572
    579         mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
    580         write_one_liner_data_file(tmp, iso_path);
    581         mr_free(tmp);
    582 
    583         log_it("isodir: %s", iso_path);
    584         mr_free(iso_path);
     573        mr_asprintf(tmp, "%s/ISO-DIR", bkpinfo->tmpdir);
     574        write_one_liner_data_file(tmp, iso_dir);
     575        mr_free(tmp);
     576
     577        log_it("iso-dir: %s", iso_dir);
     578        mr_free(iso_dir);
    585579
    586580        mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     
    596590        mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
    597591        write_one_liner_data_file(tmp, bkpinfo->prefix);
     592        mr_free(tmp);
     593
     594        mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
     595        write_one_liner_data_file(tmp, bkpinfo->isodir);
     596        mr_free(tmp);
     597
     598        mr_asprintf(tmp, "%s/ISO-DIR", bkpinfo->tmpdir);
     599        write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
    598600        mr_free(tmp);
    599601
Note: See TracChangeset for help on using the changeset viewer.