Changeset 2769 in MondoRescue

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.

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-devices.c (modified) (3 diffs)
• common/libmondo-tools.c (modified) (1 diff)
• common/mondostructures.h (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• include/mr_conf.h (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -1355 +1355 @@
 {
 char *mount_cmd;
+char *mountdir = NULL;
 int i, res;
 #ifdef __FreeBSD__
@@ -1397 +1398 @@
 
     } else if (bkpinfo->backup_media_type == iso) {
+        if (bkpinfo->subdir) {
+            mr_asprintf(&mountdir, "%s/%s", bkpinfo->isodir, bkpinfo->subdir);
+        } else {
+            mr_asprintf(&mountdir, "%s", bkpinfo->isodir);
+        }
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
+        sprintf(mount_cmd, "%s/%s-%d.iso", mountdir,
             bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
@@ -1404 +1410 @@
 #else
         sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+            mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
     } else if (bkpinfo->backup_media_type == usb) {

branches/2.2.9/mondo/src/common/libmondo-tools.c

@@ -799 +799 @@
     bkpinfo->netfs_remote_dir[0] = '\0';
     bkpinfo->exclude_paths = NULL;
+    bkpinfo->subdir = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;

branches/2.2.9/mondo/src/common/mondostructures.h

@@ -581 +581 @@
    */
     char *netfs_user;
+
+  /**
+   * The potential subdirectory under which are located ISO images on HDD (restore mode only)
+   */
+    char *subdir;
 
   /**

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -449 +449 @@
         mr_free(bkpinfo->exclude_devs);
         mr_free(bkpinfo->exclude_paths);
+        mr_free(bkpinfo->subdir);
 
         /* Then free the structure */

branches/2.2.9/mondo/src/include/mr_conf.h

@@ -59 +59 @@
     /* Default compression level */
     int compression_level;
+    /* Subdir for ISO images on HDD */
+    char *subdir;
     /* Paths to exclude from backup */
     char *exclude_paths;

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);
             }

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

@@ -900 +900 @@
         if (strcmp(old_isodir, bkpinfo->isodir)) {
             log_it
-                ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
+                ("user nominated isodir %s differs from archive %s, keeping user's choice\n",
                 old_isodir, bkpinfo->isodir);
             strcpy(bkpinfo->isodir, old_isodir);