Changeset 1087 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Feb 2, 2007, 11:31:00 PM (17 years ago)

Author:

Bruno Cornec

Message:

WARNING: Not tested yet ! Will be stabilized in next hours.
this patch changes the interface between mindi and mondo.
Everything is now managed through either MONDO_CACHE/mondo-restore.cfg
and MONDO_CACHE/mindi.conf (an additional configuration file)
This removes all the one line files NFS-*, ... that where used
in an anarchic way. Now everything computed by mondo is
under mondo-restore.cfg and everything related to mindi in mindi.conf

Still needed are the removal of the 2 parameters to mindi,
but that will be done after when a clear line is drawn between
where files are put by each tool.

MONDO_TMP and MINDI_TMP should be reserved for temporary files
MONDO_CACHE and MINDI_CACHE for end results and communication
between tools.
These changes were made in order to prepare the USB support in mondo

A first step in the right direction, but still some work to do
before it's working again.
Testers please be warned.

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

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

@@ -5 +5 @@
 #include "mr_mem.h"
 
+extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
 
 /**
@@ -2265 +2266 @@
                 char *isodir_path, bool nuke_me_please)
 {
+    char *value = NULL;
 
     /** initialize ********************************************************/
+    malloc_string(value);
 
     assert(isodir_device != NULL);
@@ -2272 +2275 @@
     assert(isodir_path != NULL);
 
-    log_it("%d - AAA - isodir_path = %s", isodir_path);
+    log_it("%d - AAA - isodir_path = %s", __LINE__, isodir_path);
     isodir_format[0] = '\0';
     if (isodir_device[0] == '\0') {
@@ -2280 +2283 @@
         strcpy(isodir_path, "/");
     }
-    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
-        strcpy(isodir_device, last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+    if (read_cfg_var(g_mondo_cfg_file, "nfs-server-path", value) == 0) {
+        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount", isodir_device);
         strcpy(isodir_format, "nfs");
-        strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
-    }
+        strcpy(isodir_path, value);
+    }
+    mr_free(value);
+
     if (nuke_me_please) {
         return (TRUE);