Changeset 3278 in MondoRescue for branches/3.2/mondo/src/mondorestore

Timestamp:

Apr 30, 2014, 12:30:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• File KEYMAP-LIVES-HERE, USING-* not used anymore
• Nomalize name usinf iso-dir and ISO-DIR where relevant
• config entry netfs-server-path not used anymore (iso-dir instead when needed)
• In network restore mode, also have the extended boot messages
• Manages grub2 version string as grub 1 was

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (5 diffs)
• mondorestore.c (modified) (1 diff)

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

@@ -267 +267 @@
         strcpy(bkpinfo->isodir, "/");
     }
-    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
+    // TODO: Are we shure it does what it's expected to do here ?
+    if (does_file_exist("/tmp/NETFS-SERVER-MOUNT")) {
         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"));
+        strcpy(bkpinfo->isodir, last_line_of_file("/tmp/ISO-DIR"));
     }
     if (nuke_me_please) {
@@ -276 +277 @@
     }
 
-    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_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)) {
+            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);
@@ -327 +320 @@
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
 if (bkpinfo->disaster_recovery) {
-    /* Patch Conor Daly 26-june-2004 
-    * Don't let this clobber an existing bkpinfo->isodir */
+    /* Don't let this clobber an existing bkpinfo->isodir */
     if (!bkpinfo->isodir[0]) {
         strcpy(bkpinfo->isodir, "/tmp/isodir");
     }
-    /* End patch */
     mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
     run_program_and_log_output(command, 5);
@@ -865 +856 @@
         mr_free(bkpinfo->netfs_mount);
         mr_asprintf(bkpinfo->netfs_mount, "%s", value);
-
-        read_cfg_var(cfg_file, "netfs-server-path", value);
+        if (bkpinfo->netfs_mount != NULL) {
+            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        }
+
+        read_cfg_var(cfg_file, "iso-dir", value);
         mr_free(bkpinfo->netfs_remote_dir);
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", value);
-
-        if (bkpinfo->netfs_mount != NULL) {
-            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
-        }
         if (bkpinfo->netfs_remote_dir != NULL) {
             log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
         }
+
         if (bkpinfo->netfs_proto != NULL) {
             log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
@@ -907 +898 @@
     mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
     read_cfg_var(cfg_file, "iso-mnt", iso_mnt);
-    read_cfg_var(cfg_file, "isodir", iso_path);
+    read_cfg_var(cfg_file, "iso-dir", iso_path);
     sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
     if (!bkpinfo->isodir[0]) {

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -702 +702 @@
 //    {
     if (system("umount -d /tmp/isodir 2> /dev/null")) {
-        log_to_screen
-            ("WARNING - unable to unmount device where the ISO files are stored.");
+        log_to_screen("WARNING - unable to unmount device where the ISO files are stored.");
     }
 //    }