Changeset 2769 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Apr 21, 2011, 1:48:52 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Introduce a new bkpinfo member (subdir) to support storing the subdir under which ISO images are stored on an external HDD. Should fix mostly #433.

File:

• branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (2 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2281 +2281 @@
 {
 
+    bool HDD = FALSE;
+    char *subdir_path;
     /** initialize ********************************************************/
 
@@ -2311 +2313 @@
              "What is the disk format of the device? (Hit ENTER if you don't know.)",
              isodir_format, 16)) {
+            if (popup_with_button("Are you restoring from an external hard drive ?", "Yes", "No")) {
+                HDD = TRUE;
+            }
             if (popup_and_get_string
                 ("ISO Mode - path",
-                 "At what path on this device can the ISO files be found ? (Use /tmp/isodir if restoring from HDD)",
-                 isodir_path, MAX_STR_LEN / 4)) {
+                "At what path on this device can the ISO files be found ?",
+                isodir_path, MAX_STR_LEN / 4)) {
                 strip_spaces(isodir_device);
                 strip_spaces(isodir_format);
                 strip_spaces(isodir_path);
                 log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path);
+                if (HDD) {
+                    /*  We need an additional param */
+                    mr_asprintf(&subdir_path, "%s", isodir_path);
+                    bkpinfo->subdir = subdir_path;
+                    strcpy(isodir_path, "/tmp/isodir");
+                }
                 return (TRUE);
             }