Changeset 252 in MondoRescue for trunk/mondo/mondo

Timestamp:

Dec 21, 2005, 2:45:55 AM (18 years ago)

Author:

bcornec

Message:

merge -r249:251 $SVN_M/branches/2.05

Location:

trunk/mondo/mondo

Files:

• common/libmondo-devices.c (modified) (3 diffs)
• mondoarchive/main.c (modified) (2 diffs)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1762 +1762 @@
         paranoid_free(prompt);
 
+        if (!popup_and_get_string
+            ("Prefix.",
+             "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
+            bkpinfo->prefix, MAX_STR_LEN / 4)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+
         for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
             bkpinfo->media_size[i] = 650;
@@ -1804 +1813 @@
                     finish(1);
                 }
+                log_msg(3, "prefix set to %s", bkpinfo->prefix);
             } else {
                 for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -1955 +1965 @@
     log_it("media type = %s",
            bkptype_to_string(bkpinfo->backup_media_type));
+    log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
     log_it("include_paths = '%s'", bkpinfo->include_paths);

trunk/mondo/mondo/mondoarchive/main.c

@@ -53 +53 @@
 {
     log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
-            VERSION);
+            PACKAGE_VERSION);
     log_msg(0, "running on %s architecture", get_architecture());
     log_msg(0,
@@ -148 +148 @@
         && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
             || !strcmp(argv[argc - 1], "--version"))) {
-        printf("mondoarchive v%s\nSee man page for help\n", VERSION);
+        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
         exit(0);
     }

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -3144 +3144 @@
 void welcome_to_mondorestore()
 {
-    log_msg(0, "-------------- Mondo Restore v%s -------------", VERSION);
+    log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
     log_msg(0,
             "DON'T PANIC! Mondorestore logs almost everything, so please ");

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -1016 +1016 @@
                     log_it
                         ("Re-jigging configuration AGAIN. CD-R, not ISO.");
-                } else {
-                    bkpinfo->backup_media_type = iso;
-                    if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                            strcpy(bkpinfo->prefix,value);
-                    } else {
-                            strcpy(bkpinfo->prefix,STD_PREFIX);
-                    }
                 }
+            if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
+                    strcpy(bkpinfo->prefix,value);
+            } else {
+                    strcpy(bkpinfo->prefix,STD_PREFIX);
             }
         } else if (!strcmp(value, "nfs")) {