Changeset 2769 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

Apr 21, 2011, 1:48:52 PM (14 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/common

Files:

• libmondo-devices.c (modified) (3 diffs)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)
• newt-specific.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 */