Changeset 3158 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-rstr-newt.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-newt.c (modified) (1 diff)

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

@@ -2266 +2266 @@
 
 /**
- * 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 isodir_path Where to put the path (e.g. /var/cache/mondo) 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,
-                char *isodir_path, char *subdir_path, bool nuke_me_please)
-{
-
-    bool HDD = FALSE;
-    /** initialize ********************************************************/
-
-    assert(isodir_device != NULL);
-    assert(isodir_format != NULL);
-    assert(isodir_path != NULL);
-
-    log_it("isodir_path = %s", isodir_path);
-    isodir_format[0] = '\0';
-    if (isodir_device[0] == '\0') {
-        strcpy(isodir_device, "/dev/");
-    }
-    if (isodir_path[0] == '\0') {
-        strcpy(isodir_path, "/");
-    }
-    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
-        strcpy(isodir_device, last_line_of_file("/tmp/NETFS-SERVER-MOUNT"));
-        strcpy(isodir_format, "netfs");
-        strcpy(isodir_path, 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 ?",
-                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);
-                    strcpy(isodir_path, "/tmp/isodir");
-                }
-                return (TRUE);
-            }
-        }
-    }
-    return (FALSE);
-}
-
-
-/**
  * Create a new raidtab entry for @p device in @p raidlist.
  * @param raidlist The raidlist to add the device to.