Changeset 1535 in MondoRescue for branches/stable/mondo/src

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (2 diffs)
• include/mr_conf.h (modified) (2 diffs)
• lib/mr_conf.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (3 diffs)

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

@@ -40 +40 @@
 
 #define DVDRWFORMAT 1
+
+extern struct mr_ar_conf mr_conf;
 
 
@@ -1869 +1871 @@
         mr_free(message_to_screen);
     } else {
-        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
+        mr_asprintf(&message_to_screen, "Running %s to make %s #%d",
+                mr_conf->iso_creation_cmd,
                  bkpinfo->backup_media_string,
                  g_current_media_number);
         mr_msg(1, message_to_screen);
-        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
+        mr_asprintf(&result_sz, "Call to %s to make ISO (%s #%d) ",
+                mr_conf->iso_creation_cmd,
                  bkpinfo->backup_media_string,
                  g_current_media_number);

branches/stable/mondo/src/include/mr_conf.h

@@ -4 +4 @@
  *
  * based on parse_conf.h (c)2002-2004 Anton Kulchitsky  mailto:anton@kulchitsky.org
- * Review for mondorescue (c) 2006 Bruno Cornec <bruno@mondorescue.org>
+ * Reviewed for mondorescue (c) 2006-2007 Bruno Cornec <bruno@mondorescue.org>
  *   
  *     Header file of mr_conf: a very small and simple
@@ -21 +21 @@
  */
 struct mr_ar_conf {
-    /* ISO image CLI command to use */
+    /* MINDI: ISO image CLI command to use */
     char *iso_creation_cmd;
-    /* ISO image common creation options */
-    char *iso_creation_options;
+    /* MINDI: ISO image common creation options */
+    char *iso_creation_opt;
     /* ISO Burning CLI command to use */
     char *iso_burning_cmd;

branches/stable/mondo/src/lib/mr_conf.c

@@ -212 +212 @@
 
 /*
-  reads string outstr after string str in the current file (between
-  "..."), not more than maxlength symbols: cannot check if outstr has
-  enough length! It must be at least maxlength+1 ! Returns number of
-  read chars
 */
 char *mr_conf_sread(const char *field_name) {

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();