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

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

@@ -11 +11 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
 #include "mondostructures.h"
 #include "lib-common-externs.h"
@@ -409 +410 @@
     char *iso_tmp;
     char *iso_path;
+    FILE *fd1 = NULL;
 
     assert(bkpinfo != NULL);
@@ -643 +645 @@
                 bkpinfo->isodir);
         log_it("command = %s", command);
-        log_it("res of it = %s",
-               call_program_and_get_last_line_of_output(command));
         sprintf(iso_dev, "%s",
                 call_program_and_get_last_line_of_output(command));
-        sprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp,
-                                  call_program_and_get_last_line_of_output
-                                  (command));
+        log_it("res of it = %s", iso_dev);
+
+        fd1 = mr_fopen(MONDORESTORECFG, "a");
+        mr_fprintf(fd1, "iso-dev %s\n", iso_dev);
 
         sprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
                 iso_dev);
         log_it("command = %s", command);
-        log_it("res of it = %s",
-               call_program_and_get_last_line_of_output(command));
         sprintf(iso_mnt, "%s",
                 call_program_and_get_last_line_of_output(command));
-        sprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp,
-                                  call_program_and_get_last_line_of_output
-                                  (command));
+
+        log_it("res of it = %s", iso_mnt);
+        mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt);
         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
+
         sprintf(iso_tmp, "%s", bkpinfo->isodir);
         if (strlen(iso_tmp) < strlen(iso_mnt)) {
@@ -670 +668 @@
             sprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
         }
-        sprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, iso_path);
         log_it("isodir: %s", iso_path);
-        sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, bkpinfo->prefix);
+        mr_fprintf(fd1, "isodir %s\n", iso_path);
+
         log_it("iso-prefix: %s",  bkpinfo->prefix);
-
-/* End patch */
+        mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+
+        mr_flcose(fd1);
     }                           // end of iso code