Ignore:
Timestamp:
Jul 18, 2007, 6:18:02 PM (13 years ago)
Author:
Bruno Cornec
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondoarchive/mondoarchive.c

    r1458 r1535  
    133133}
    134134
     135/* fill the mr_ar_conf structure from mindi's conf file */
     136static void mr_ar_store_conf_mindi(struct mr_ar_conf *mr_cnf) {
     137   
     138    char *p = NULL;
     139
     140    p = mr_conf_sread("mr_iso_creation_cmd");
     141    if (p != NULL) {
     142        mr_cnf->iso_creation_cmd = p;
     143    }
     144    p = mr_conf_sread("mr_iso_creation_opt");
     145    if (p != NULL) {
     146        mr_cnf->iso_creation_opt = p;
     147    }
     148}
     149
    135150/* create the mr_ar_conf structure from mondo's conf file */
    136151static void mr_ar_store_conf(struct mr_ar_conf *mr_cnf) {
    137152   
    138153    char *p = NULL;
    139 
    140     mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_cmd"));
    141     mr_cnf->iso_creation_cmd = p;
    142     p = NULL;
    143 
    144     mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_options"));
    145     mr_cnf->iso_creation_options = p;
    146     p = NULL;
    147154
    148155    mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_cmd"));
     
    234241    }
    235242    mr_free(mr_cnf->iso_creation_cmd);
    236     mr_free(mr_cnf->iso_creation_options);
     243    mr_free(mr_cnf->iso_creation_opt);
    237244    mr_free(mr_cnf->iso_burning_cmd);
    238245    mr_free(mr_cnf->iso_burning_options);
     
    331338    mr_conf_close();
    332339
     340    /* Check md5 sum before */
     341    /* Get content of mindi conf file now to finish structure initialization */
     342/* Tempo Hack */
     343#define MINDI_CONF_DIR /etc/mindi
     344    if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf.dist") != 0) {
     345            mr_log_exit(-1, "Unable to open "MINDI_CONF_DIR"/mindi.conf.dist");
     346    }
     347    mr_ar_store_conf_mindi(&mr_conf);
     348    mr_conf_close();
     349
     350    if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf") == 0) {
     351        mr_ar_store_conf_mindi(&mr_conf);
     352        mr_conf_close();
     353    }
     354    mr_msg(5, "Command for ISO images is %s", mr_cnf->iso_creation_cmd);
     355
    333356    /* Add MONDO_SHARE + other environment variables for mindi */
    334357    setenv_mondo_var();
Note: See TracChangeset for help on using the changeset viewer.