Changeset 3158 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Jun 24, 2013, 10:20:16 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First attempt at fixing #628 by avoiding to erase choices done for varible bkpinfo->isodir and g_isodir_device in iso_fiddly_bits later in the code. Needs testing by people using external disks containing ISO.

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (11 diffs)

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

@@ -41 +41 @@
 extern char *g_tmpfs_mountpt;
 */
-extern char *g_isodir_device;
-extern char *g_isodir_format;
+
+/**
+ * The device to mount to get at the ISO images. Ignored unless @p g_ISO_restore_mode.
+ */
+char *g_isodir_device;
+
+
+/**
+ * The format of @p g_isodir_device. Ignored unless @p g_ISO_restore_mode.
+ */
+char *g_isodir_format;
+
 extern long g_current_progress, g_maximum_progress;
 extern char *g_biggielist_txt;  // where 'biggielist.txt' is stored, on ramdisk / tempdir;
@@ -264 +274 @@
 **************************************************************************/
 
+/**
+ * Get information about the location of ISO images from the user.
+ * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters.
+ * @param isodir_format Where to put the format (e.g. ext2) the user enters.
+ * @param nuke_me_please Whether we're planning on nuking or not.
+ * @return TRUE if OK was pressed, FALSE otherwise.
+ */
+bool
+get_isodir_info(char *isodir_device, char *isodir_format,
+                struct s_bkpinfo *bkpinfo, bool nuke_me_please)
+{
+
+    bool HDD = FALSE;
+    /** initialize ********************************************************/
+
+    assert(isodir_device != NULL);
+    assert(isodir_format != NULL);
+    assert(bkpinfo->isodir != NULL);
+
+    log_it("bkpinfo->isodir = %s", bkpinfo->isodir);
+    isodir_format[0] = '\0';
+    if (isodir_device[0] == '\0') {
+        strcpy(isodir_device, "/dev/");
+    }
+    if (bkpinfo->isodir[0] == '\0') {
+        strcpy(bkpinfo->isodir, "/");
+    }
+    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
+        strcpy(isodir_device, last_line_of_file("/tmp/NETFS-SERVER-MOUNT"));
+        strcpy(isodir_format, "netfs");
+        strcpy(bkpinfo->isodir, last_line_of_file("/tmp/NETFS-SERVER-PATH"));
+    }
+    if (nuke_me_please) {
+        return (TRUE);
+    }
+
+    if (popup_and_get_string
+        ("ISO Mode - device", "On what device do the ISO files live?",
+         isodir_device, MAX_STR_LEN / 4)) {
+        if (popup_and_get_string
+            ("ISO Mode - format",
+             "What is the disk format of the device? (Hit ENTER if you don't know.)",
+             isodir_format, 16)) {
+            if (popup_with_buttons("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 ?",
+                bkpinfo->isodir, MAX_STR_LEN / 4)) {
+                strip_spaces(isodir_device);
+                strip_spaces(isodir_format);
+                strip_spaces(bkpinfo->isodir);
+                log_it("isodir_device = %s - isodir_format = %s - bkpinfo->isodir = %s", isodir_device, isodir_format, bkpinfo->isodir);
+                if (HDD) {
+                    /*  We need an additional param */
+                    mr_asprintf(&(bkpinfo->subdir), "%s", bkpinfo->isodir);
+                    strcpy(bkpinfo->isodir, "/tmp/isodir");
+                    log_it("Now bkpinfo->isodir = %s and subdir = ", bkpinfo->isodir, bkpinfo->subdir);
+                }
+                return (TRUE);
+            }
+        }
+    }
+    return (FALSE);
+}
 
 
@@ -299 +375 @@
 }
 
-if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, bkpinfo->subdir, nuke_me_please)) {
+if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo, nuke_me_please)) {
     return (1);
 }
@@ -643 +719 @@
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
 assert(bkpinfo != NULL);
+log_it("Entering read_cfg_file_into_bkpinfo");
 
 if (!cfgf) {
@@ -665 +742 @@
     bkpinfo->please_dont_eject = TRUE;
 } else if (!strcmp(value, "iso")) {
-
-// Patch by Conor Daly - 2004/07/12
     bkpinfo->backup_media_type = iso;
     if (am_I_in_disaster_recovery_mode()) {
         /* Check to see if CD is already mounted before mounting it... */
         if (!is_this_device_mounted("/dev/cdrom")) {
-            log_msg(2,
-                    "NB: CDROM device not mounted, mounting...");
-            run_program_and_log_output("mount /dev/cdrom "
-                                       MNT_CDROM, 1);
+            log_msg(2, "NB: CDROM device not mounted, mounting...");
+            run_program_and_log_output("mount /dev/cdrom " MNT_CDROM, 1);
         }
         if (does_file_exist(MNT_CDROM "/archives/filelist.0")) {
             bkpinfo->backup_media_type = cdr;
             run_program_and_log_output("umount -d " MNT_CDROM, 1);
-            log_it
-                ("Re-jigging configuration AGAIN. CD-R, not ISO.");
+            log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
         }
     }
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
+        strcpy(bkpinfo->prefix,value);
     } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
+        strcpy(bkpinfo->prefix,STD_PREFIX);
+    }
+    log_it("Setting Prefix to %s", bkpinfo->prefix);
 } else if ((!strcmp(value, "netfs")) || (!strcmp(value, "nfs"))) {
     /* Stay compatible with previous versions by allowing nfs as an entry here */
@@ -757 +830 @@
         strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
         bkpinfo->media_size = 1999 * 1024;  /* 650, probably, but we don't need this var anyway */
-        log_msg(2, "Backup medium is CD-R[W]");
+        log_msg(2, "Backup medium is similar to CD-R[W]");
     }
 } else {
@@ -843 +916 @@
 
 read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
-if (tmp[0]
-||
-strstr(call_program_and_get_last_line_of_output
-       ("cat /proc/cmdline"), "donteject")) {
-bkpinfo->please_dont_eject = TRUE;
-log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
+if (tmp[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
+    bkpinfo->please_dont_eject = TRUE;
+    log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
 }
 
@@ -897 +967 @@
         strcpy(bkpinfo->isodir, old_isodir);
     }
-    if (!bkpinfo->disaster_recovery) {
+    if ((!bkpinfo->disaster_recovery) || (g_isodir_device[0] != '\0')) {
         if (strcmp(old_isodir, bkpinfo->isodir)) {
             log_it
@@ -905 +975 @@
         }
     }
-    read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-    log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
-            g_isodir_device);
+    if (g_isodir_device[0] == '\0') {
+        /*  We don't want to loose our conf made earlier in iso_fiddly_bits 
+         *  so go here only if job not done already */
+        read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
+    }
+
+    log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
     if (bkpinfo->disaster_recovery) {
         if (is_this_device_mounted(g_isodir_device)) {
             log_msg(2, "NB: isodir is already mounted");
             /* Find out where it's mounted */
-            sprintf(command,
-                    "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3",
-                    g_isodir_device);
+            sprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
             log_it("command = %s", command);
             log_it("res of it = %s",
@@ -941 +1013 @@
         }
         /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
-        if (bkpinfo->backup_media_type == iso) {
+        /*  except when already done is iso_fiddly_bits */
+        if ((bkpinfo->backup_media_type == iso) && (g_isodir_device[0] == '\0')) {
             sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
         }
@@ -950 +1023 @@
     if (g_restoring_live_from_cd) {
         if (bkpinfo->backup_media_type != media_specified_by_user) {
-            log_msg(2,
-                    "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
+            log_msg(2, "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
             interactively_obtain_media_parameters_from_user(FALSE);
             media_specified_by_user = bkpinfo->backup_media_type;