Changeset 1535 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondoarchive.c

Timestamp:

Jul 18, 2007, 6:18:02 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use the configuration files in mondo (begining). That revision doesn't even compile.

File:

• branches/stable/mondo/src/mondoarchive/mondoarchive.c (modified) (3 diffs)

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -133 +133 @@
 }
 
+/* fill the mr_ar_conf structure from mindi's conf file */
+static void mr_ar_store_conf_mindi(struct mr_ar_conf *mr_cnf) {
+    
+    char *p = NULL;
+
+    p = mr_conf_sread("mr_iso_creation_cmd");
+    if (p != NULL) {
+        mr_cnf->iso_creation_cmd = p;
+    }
+    p = mr_conf_sread("mr_iso_creation_opt");
+    if (p != NULL) {
+        mr_cnf->iso_creation_opt = p;
+    }
+}
+
 /* create the mr_ar_conf structure from mondo's conf file */
 static void mr_ar_store_conf(struct mr_ar_conf *mr_cnf) {
     
     char *p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_cmd"));
-    mr_cnf->iso_creation_cmd = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_options"));
-    mr_cnf->iso_creation_options = p;
-    p = NULL;
 
     mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_cmd"));
@@ -234 +241 @@
     }
     mr_free(mr_cnf->iso_creation_cmd);
-    mr_free(mr_cnf->iso_creation_options);
+    mr_free(mr_cnf->iso_creation_opt);
     mr_free(mr_cnf->iso_burning_cmd);
     mr_free(mr_cnf->iso_burning_options);
@@ -331 +338 @@
     mr_conf_close();
 
+    /* Check md5 sum before */
+    /* Get content of mindi conf file now to finish structure initialization */
+/* Tempo Hack */
+#define MINDI_CONF_DIR /etc/mindi
+    if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf.dist") != 0) {
+            mr_log_exit(-1, "Unable to open "MINDI_CONF_DIR"/mindi.conf.dist");
+    }
+    mr_ar_store_conf_mindi(&mr_conf);
+    mr_conf_close();
+
+    if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf") == 0) {
+        mr_ar_store_conf_mindi(&mr_conf);
+        mr_conf_close();
+    }
+    mr_msg(5, "Command for ISO images is %s", mr_cnf->iso_creation_cmd);
+
     /* Add MONDO_SHARE + other environment variables for mindi */
     setenv_mondo_var();