Changeset 1087 in MondoRescue for branches/stable/mondo/src/common/libmondo-files.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/common/libmondo-files.c (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-files.c

@@ -20 +20 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
+
+#include "mr_file.h"
 
 /*@unused@*/
@@ -1157 +1159 @@
     char command[MAX_STR_LEN * 2];
 
+    FILE *fd1 = NULL;
+
     /*@ pointers ***** */
     char *p;
@@ -1218 +1222 @@
     }
 
-    sprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_dev);
-
-    sprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    sprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_netmask);
-    sprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_broadcast);
-    sprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_defgw);
-    sprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    sprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
-    sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->prefix);
+    fd1 = mr_fopen(MONDORESTORECFG, "a");
+
+    mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev);
+    mr_fprintf(fd1, "nfs-client-ipaddr %s\n", nfs_client_ipaddr);
+    mr_fprintf(fd1, "nfs-client-netmask %s\n", nfs_client_netmask);
+    mr_fprintf(fd1, "nfs-client-broadcast %s\n", nfs_client_broadcast);
+    mr_fprintf(fd1, "nfs-client-defgw %s\n", nfs_client_defgw);
+    mr_fprintf(fd1, "nfs-server-ipaddr %s\n", nfs_server_ipaddr);
+    mr_fprintf(fd1, "nfs-server-mount %s\n", bkpinfo->nfs_mount);
+    mr_fprintf(fd1, "nfs-server-path %s\n", bkpinfo->nfs_remote_dir);
+    mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+    mr_flcose(fd1);
+
     log_it("Finished storing NFS configuration");
 }