Changeset 1535 in MondoRescue for branches/stable/mondo
- Timestamp:
- Jul 18, 2007, 6:18:02 PM (17 years ago)
- Location:
- branches/stable/mondo
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/distributions/conf/mondo.conf.dist
r1529 r1535 4 4 # 5 5 # We tried to give sensible defaults in this file. 6 # It will alw ys be loaded by mondoarchive before your own configuration files.6 # It will always be loaded by mondoarchive before your own configuration files. 7 7 # DO NOT CHANGE THAT FILE IN ANYWAY AS ITS MD5 SUM IS USED AS A CHECK !! 8 8 # Anyway changing some values in your own configuration file may render 9 9 # mondoarchive instable or cause failures. Use with care. 10 11 #12 # ISO image CLI command to use13 # do not specify the -o, -c or the -b options, nor the directory to backup14 # as they will be generated by mondoarchive15 #16 mondo_iso_creation_cmd="/usr/bin/mkisofs"17 #mondo_iso_creation_cmd="/usr/bin/growisofs"18 19 #20 # ISO image common creation options (for mkisofs and growisofs)21 # do not specify the -o, -c or the -b options, nor the directory to backup22 #23 mondo_iso_creation_options="-J -r -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue -V _CD#_"24 #mondo_iso_creation_options="-use-the-force-luke -v -J -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue -V _CD#_"25 10 26 11 # … … 30 15 31 16 # 32 # 17 # ISO Burning CLI command options 33 18 mondo_iso_burning_options="-eject dev=_DEVICE_ speed=_SPEED_ fs=24m driveropts=burnfree" 34 19 … … 41 26 # Default size of media 42 27 # 43 # Use 4 380 for DVDs, 650 or 700 for CDs28 # Use 4480 for DVDs, 650 or 700 for CDs 44 29 # 45 30 mondo_media_size=4480 -
branches/stable/mondo/src/common/libmondo-archive.c
r1438 r1535 40 40 41 41 #define DVDRWFORMAT 1 42 43 extern struct mr_ar_conf mr_conf; 42 44 43 45 … … 1869 1871 mr_free(message_to_screen); 1870 1872 } else { 1871 mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d", 1873 mr_asprintf(&message_to_screen, "Running %s to make %s #%d", 1874 mr_conf->iso_creation_cmd, 1872 1875 bkpinfo->backup_media_string, 1873 1876 g_current_media_number); 1874 1877 mr_msg(1, message_to_screen); 1875 mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ", 1878 mr_asprintf(&result_sz, "Call to %s to make ISO (%s #%d) ", 1879 mr_conf->iso_creation_cmd, 1876 1880 bkpinfo->backup_media_string, 1877 1881 g_current_media_number); -
branches/stable/mondo/src/include/mr_conf.h
r1422 r1535 4 4 * 5 5 * based on parse_conf.h (c)2002-2004 Anton Kulchitsky mailto:anton@kulchitsky.org 6 * Review for mondorescue (c) 2006Bruno Cornec <bruno@mondorescue.org>6 * Reviewed for mondorescue (c) 2006-2007 Bruno Cornec <bruno@mondorescue.org> 7 7 * 8 8 * Header file of mr_conf: a very small and simple … … 21 21 */ 22 22 struct mr_ar_conf { 23 /* ISO image CLI command to use */23 /* MINDI: ISO image CLI command to use */ 24 24 char *iso_creation_cmd; 25 /* ISO image common creation options */26 char *iso_creation_opt ions;25 /* MINDI: ISO image common creation options */ 26 char *iso_creation_opt; 27 27 /* ISO Burning CLI command to use */ 28 28 char *iso_burning_cmd; -
branches/stable/mondo/src/lib/mr_conf.c
r1434 r1535 212 212 213 213 /* 214 reads string outstr after string str in the current file (between215 "..."), not more than maxlength symbols: cannot check if outstr has216 enough length! It must be at least maxlength+1 ! Returns number of217 read chars218 214 */ 219 215 char *mr_conf_sread(const char *field_name) { -
branches/stable/mondo/src/mondoarchive/mondoarchive.c
r1458 r1535 133 133 } 134 134 135 /* fill the mr_ar_conf structure from mindi's conf file */ 136 static 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 135 150 /* create the mr_ar_conf structure from mondo's conf file */ 136 151 static void mr_ar_store_conf(struct mr_ar_conf *mr_cnf) { 137 152 138 153 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;147 154 148 155 mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_cmd")); … … 234 241 } 235 242 mr_free(mr_cnf->iso_creation_cmd); 236 mr_free(mr_cnf->iso_creation_opt ions);243 mr_free(mr_cnf->iso_creation_opt); 237 244 mr_free(mr_cnf->iso_burning_cmd); 238 245 mr_free(mr_cnf->iso_burning_options); … … 331 338 mr_conf_close(); 332 339 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 333 356 /* Add MONDO_SHARE + other environment variables for mindi */ 334 357 setenv_mondo_var();
Note:
See TracChangeset
for help on using the changeset viewer.