Changeset 3268 in MondoRescue for branches

Timestamp:

Apr 29, 2014, 8:22:35 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix initialization of g_cd_recovery to avoid having it at TRUE inwillingly
• Remove code in netfs case now handled in mindi (mr-net-get-config)

File:

• branches/3.2/mondo/src/common/libmondo-tools.c (modified) (5 diffs)

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

@@ -44 +44 @@
 bool g_remount_cdrom_at_end,    ///< TRUE if we unmounted the CD-ROM and should remount it when done with the backup.
  g_remount_floppy_at_end;       ///< TRUE if we unmounted the floppy and should remount it when done with the backup.
-bool g_cd_recovery;             ///< TRUE if we're making an "autonuke" backup.
+bool g_cd_recovery = FALSE;             ///< TRUE if we're making an "autonuke" backup.
 double g_kernel_version;
 
@@ -363 +363 @@
     char *iso_tmp = NULL;
     char *iso_path = NULL;
+    char *cfg_fname = NULL;
 
     assert(bkpinfo != NULL);
@@ -593 +594 @@
 
     if (bkpinfo->backup_media_type == netfs) {
+        mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->prefix);
+        mr_free(tmp);
+
         if (bkpinfo->netfs_mount) {
-            mr_asprintf(hostname, "%s", bkpinfo->netfs_mount);
+            mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+            write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+            mr_free(tmp);
         } else {
             log_it("netfs_mount is NULL");
             retval++;
-            mr_asprintf(hostname, "");
-        }
-        colon = strchr(hostname, ':');
-        if (!colon) {
-            log_it("netfs mount doesn't have a colon in it");
-            retval++;
-        } else {
-            struct hostent *hent;
-
-            *colon = '\0';
-            colon = strchr(hostname, '@');
-            if (colon) {
-                *colon = '\0';
-                colon++;
-                hent = gethostbyname(colon);
-                mr_asprintf(bkpinfo->netfs_user,"%s", hostname);
-            } else {
-                hent = gethostbyname(hostname);
-            }
-            if (!hent) {
-                log_it("Can't resolve Network mount (%s): %s", hostname, hstrerror(h_errno));
-                retval++;
-            } else {
-                mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
-                mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
-                mr_free(bkpinfo->netfs_mount);
-                bkpinfo->netfs_mount = ip_address;
-            }
-        }
-        mr_free(hostname);
-        store_netfs_config();
+        }
     }
 
@@ -1028 +1005 @@
 /**
  * Retrieve the line containing @p label from the config file.
- * @param config_file The file to read from, usually @c /tmp/mondo-restore.cfg.
+ * @param config_file The file to read from, usually @c /tmp/mondorestore.cfg.
  * @param label What to read from the file.
  * @param value Where to put it.
@@ -1251 +1228 @@
  * Write a line to a configuration file. Writes a line of the form,
  * @c label @c value.
- * @param config_file The file to write to. Usually @c mondo-restore.cfg.
+ * @param config_file The file to write to. Usually @c mondorestore.cfg.
  * @param label What to call this bit of data you're writing.
  * @param value The bit of data you're writing.