Changeset 251 for branches/2.05


Ignore:
Timestamp:
Dec 21, 2005, 2:43:37 AM (14 years ago)
Author:
bcornec
Message:
  • iso-prefix should be read in iso mode even when -H not given (Stan Benoit)
  • prefix is also asked interactively for nfs mode (Bruno Cornec)
  • PACKAGE_VERSION used instead of VERSION for mondo{archive,restore} (Bruno Cornec)
Location:
branches/2.05/mondo/mondo
Files:
4 edited

Legend:

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

    r231 r251  
    21662166                    bkpinfo->nfs_remote_dir);
    21672167        }
     2168        if (!popup_and_get_string
     2169            ("Prefix.",
     2170             "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
     2171            bkpinfo->prefix, MAX_STR_LEN / 4)) {
     2172            log_to_screen("User has chosen not to backup the PC");
     2173            finish(1);
     2174        }
     2175        log_msg(3, "prefix set to %s", bkpinfo->prefix);
    21682176
    21692177        for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
     
    22072215                    finish(1);
    22082216                }
     2217                log_msg(3, "prefix set to %s", bkpinfo->prefix);
    22092218            } else {
    22102219                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
     
    23622371    log_it("media type = %s",
    23632372           bkptype_to_string(bkpinfo->backup_media_type));
     2373    log_it("prefix = %s", bkpinfo->prefix);
    23642374    log_it("compression = %ld", bkpinfo->compression_level);
    23652375    log_it("include_paths = '%s'", bkpinfo->include_paths);
  • branches/2.05/mondo/mondo/mondoarchive/main.c

    r213 r251  
    153153{
    154154    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
    155             VERSION);
     155            PACKAGE_VERSION);
    156156    log_msg(0, "running on %s architecture", get_architecture());
    157157    log_msg(0,
     
    261261        && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
    262262            || !strcmp(argv[argc - 1], "--version"))) {
    263         printf("mondoarchive v%s\nSee man page for help\n", VERSION);
     263        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
    264264        exit(0);
    265265    }
  • branches/2.05/mondo/mondo/mondorestore/mondo-restore.c

    r213 r251  
    31413141void welcome_to_mondorestore()
    31423142{
    3143     log_msg(0, "-------------- Mondo Restore v%s -------------", VERSION);
     3143    log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
    31443144    log_msg(0,
    31453145            "DON'T PANIC! Mondorestore logs almost everything, so please ");
  • branches/2.05/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r152 r251  
    10321032                    log_it
    10331033                        ("Re-jigging configuration AGAIN. CD-R, not ISO.");
    1034                 } else {
    1035                     bkpinfo->backup_media_type = iso;
    1036                     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
    1037                             strcpy(bkpinfo->prefix,value);
    1038                     } else {
    1039                             strcpy(bkpinfo->prefix,STD_PREFIX);
    1040                     }
    10411034                }
     1035            if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
     1036                    strcpy(bkpinfo->prefix,value);
     1037            } else {
     1038                    strcpy(bkpinfo->prefix,STD_PREFIX);
    10421039            }
    10431040        } else if (!strcmp(value, "nfs")) {
Note: See TracChangeset for help on using the changeset viewer.