Changeset 1256 in MondoRescue

Timestamp:

Mar 21, 2007, 12:48:32 PM (18 years ago)

Author:

Bruno Cornec

Message:

Begining of work on conf file introduction in mondo

• create a new struct mr_ar_conf to store conf info
• adds a static mr_ar_store_conf function to store conf file info in that struc
• mondo.conf is now the .dist version
• md5 not done yet

Not tested may not work at all nor compile

Location:

branches/stable/mondo

Files:

• distributions/conf/mondo.conf.dist (moved) (moved from branches/stable/mondo/distributions/conf/mondo.conf ) (5 diffs)
• src/common/libmondo-archive.c (modified) (2 diffs)
• src/include/mr_conf.h (modified) (2 diffs)
• src/lib/mr_conf.c (modified) (2 diffs)
• src/lib/mr_err.c (modified) (1 diff)
• src/mondoarchive/Makefile.am (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (10 diffs)
• src/mondoarchive/mondoarchive.h (added)

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -83 +83 @@
 
 #
-# deplist file used
+# deplist file used (either fill path or relative to 
+# mondo's configuration dir
 #
-mondo_deplist_file="/etc/mondo/deplist.txt"
+mondo_deplist_file="deplist.txt"
 
 #
@@ -128 +129 @@
 # Default compression level
 #
-mondo_compression_level=5
+mondo_compression_level=6
 
 #
@@ -134 +135 @@
 # (white space separated list of paths)
 #
-mondo_exclude_files=""
+mondo_exclude_paths=""
 
 #
@@ -140 +141 @@
 # (white space separated list of paths)
 #
-mondo_include_files=""
+mondo_include_paths=""
 
 #
-# Activate semi-graphical mode by default (yes|no)
+# Which mode should be activated by default (cli|newt|x11|web)
+# TBC
 #
-mondo_text_mode=no
+mondo_ui_mode=newt
 
 #
@@ -156 +158 @@
 # Scratch directory
 #
-mondo_scratch_dir=""
-#scratch_dir="/tmp/mondo/scratch"
+mondo_scratch_dir="/var/spool/mondo"
+#scratch_dir="/var/cache/mondo/scratch"
 
 #
-# Temporary directory
+# Temporary directory main path
+# A subdirectory will be created below to host mondo's temp files
 #
-mondo_tmp_dir=""
-#tmp_dir="/tmp/mondo/tmp"
+mondo_tmp_dir="/tmp"
+#tmp_dir="/var/cache/mondo/tmp"
 
 #

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

@@ -19 +19 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
+
 #include "mr_conf.h"
 #include "mr_mem.h"
@@ -3900 +3901 @@
     char *tmp = NULL;
     char *p = NULL;
-    char *path_min = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin";
+    char *path_min = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
 
     mr_setenv("MONDO_SHARE",MONDO_SHARE);
     mr_setenv("MONDORESTORECFG",MONDORESTORECFG);
     mr_setenv("MONDO_CACHE",MONDO_CACHE);
+    /* Add the ARCH environment variable for ia64 purposes */
+    mr_setenv("ARCH", get_architecture());
+
 
     if ((p = getenv("PATH")) == NULL) {

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

@@ -15 +15 @@
 #define MR_CONF_H
 
+/* mondoarchive structure storing conf info 
+ * each field of the configuration file should have an entry here
+ */
+struct mr_ar_conf {
+    /* ISO image CLI command to use */
+    char *iso_creation_cmd;
+    /* ISO image common creation options */
+    char *iso_creation_options;
+    /* ISO Burning CLI command to use */
+    char *iso_burning_cmd;
+    /* ISO Burning CLI command options */
+    char *iso_burning_options;
+    /* ISO Burning Speed */
+    int iso_burning_speed;
+    /* Default size of media */
+    int media_size;
+    /* Default device of media */
+    char *media_device;
+    /* Is the CD tray manual ? */
+    bool manual_tray;
+    /* Default log level */
+    int log_level;
+    /* default prefix for ISO names */
+    char *prefix;
+    /* External tape blocksize */
+    int external_tape_blocksize;
+    /* Internal tape blocksize */
+    int internal_tape_blocksize;
+    /* Size in MB of the slices for biggiefiles */
+    int slice_size;
+    /* deplist file used */
+    char *deplist_file;
+    /* Write boot floppies ? */
+    bool write_boot_floppy;
+    /* Create mindi CD ? */
+    bool create_mindi_cd;
+    /* Kernel to use */
+    char *kernel;
+    /* Additional modules to support */
+    char *additional_modules;
+    /* Boot loader to use */
+    char *boot_loader;
+    /* Differential backup ? */
+    bool differential;
+    /* Default compression tool */
+    char *compression_tool;
+    /* Default compression level */
+    int compression_level;
+    /* Paths to exclude from backup */
+    char *exclude_paths;
+    /* Paths to include onto the backup */
+    char *include_paths;
+    /* Which mode should be activated by default*/
+    char *ui_mode;
+    /* Activate automatic restore ? */
+    bool automatic_restore;
+    /* Scratch directory */
+    char *scratch_dir;
+    /* Temporary directory main path */
+    char *tmp_dir;
+    /* Images creation dir */
+    char *images_dir;
+};
+
 /* functions (public methods) */
 
@@ -27 +91 @@
 extern double mr_conf_fread(const char *field_name);
 
+/*read boolean after string str in the current file*/
+extern bool mr_conf_bread(const char *field_name);
+
 /*
  * read string after string str in the current file.

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

@@ -207 +207 @@
 }
 
+
 /*
   reads string outstr after string str in the current file (between
@@ -256 +257 @@
     mr_free(q);
 
+    return ret;
+}
+
+/*read boolean after string str in the current file*/
+bool mr_conf_bread(const char *field_name) {
+    char *p = NULL;             /*pointer to the field */
+    bool ret = FALSE;
+    
+    p = mr_conf_sread(field_name);
+    if (p != NULL) {
+        /* match if yes/true/1 */
+        if ((strncasecmp(p, "y" , (size_t)1) == 0) ||
+            (strncasecmp(p, "t" , (size_t)1) == 0) ||
+            (strncasecmp(p, "1" , (size_t)1) == 0)) {
+            ret = TRUE;
+        }
+    }
     return ret;
 }

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

@@ -36 +36 @@
 
     mr_cleanup();
-    fprintf(stderr,"%s\n",message);
+    if (message != NULL) {
+        fprintf(stderr,"%s\n",message);
+    }
     exit(errorcode);
 }

branches/stable/mondo/src/mondoarchive/Makefile.am

@@ -4 +4 @@
 ## Process with Automake to generate Makefile.in
 ##
-AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include -I${top_builddir}/src/common
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include -I${top_builddir}/src/common -I${top_builddir}/src/mondoarchive
 
 ## Headers
-noinst_HEADERS       = mondo-cli-EXT.h mondo-cli.h
+noinst_HEADERS       = mondo-cli-EXT.h mondo-cli.h mondoarchive.h
 
 ## The program

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

@@ -22 +22 @@
 #include "mondo-cli-EXT.h"
 
+#include "mondoarchive.h"
 #include "mr_mem.h"
 #include "mr_str.h"
 #include "mr_msg.h"
 #include "mr_file.h"
+#include "mr_conf.h"
 
 // for CVS
@@ -41 +43 @@
 extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_cdrw_drive_is_here;
+extern double g_kernel_version;
+extern char *g_magicdev_command;
+extern t_bkptype g_backup_media_type;
+extern int g_loglevel;
+
 static char *g_cdrom_drive_is_here = NULL;
 static char *g_dvd_drive_is_here = NULL;
-extern double g_kernel_version;
-
-/***************** global vars, used only by main.c ******************/
+
+struct mr_ar_conf mr_conf;
+
+/***************** global vars ******************/
 bool g_skip_floppies;
 long diffs;
@@ -51 +59 @@
 char *ps_proc_id = "$2";
 
-extern t_bkptype g_backup_media_type;
-extern int g_loglevel;
-
-/****************** subroutines used only by main.c ******************/
+/****************** subroutines used only here ******************/
 
 
@@ -60 +65 @@
  * Print a "don't panic" message to the log and a message about the logfile to the screen.
  */
-void welcome_to_mondoarchive(void)
+static void welcome_to_mondoarchive(void)
 {
-    mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
-            PACKAGE_VERSION);
+    mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", PACKAGE_VERSION);
     mr_msg(0, "running on %s architecture", get_architecture());
-    mr_msg(0,
-            "-----------------------------------------------------------");
-    mr_msg(0,
-            "NB: Mondo logs almost everything, so don't panic if you see");
-    mr_msg(0,
-            "some error messages.  Please read them carefully before you");
-    mr_msg(0,
-            "decide to break out in a cold sweat.    Despite (or perhaps");
-    mr_msg(0,
-            "because of) the wealth of messages. some users are inclined");
-    mr_msg(0,
-            "to stop reading this log. If Mondo stopped for some reason,");
-    mr_msg(0,
-            "chances are it's detailed here.  More than likely there's a");
-    mr_msg(0,
-            "message at the very end of this log that will tell you what");
-    mr_msg(0,
-            "is wrong. Please read it!                          -Devteam");
-    mr_msg(0,
-            "-----------------------------------------------------------");
+    mr_msg(0, "-----------------------------------------------------------");
+    mr_msg(0, "NB: Mondo logs almost everything, so don't panic if you see");
+    mr_msg(0, "some error messages.  Please read them carefully before you");
+    mr_msg(0, "decide to break out in a cold sweat.    Despite (or perhaps");
+    mr_msg(0, "because of) the wealth of messages. some users are inclined");
+    mr_msg(0, "to stop reading this log. If Mondo stopped for some reason,");
+    mr_msg(0, "chances are it's detailed here.  More than likely there's a");
+    mr_msg(0, "message at the very end of this log that will tell you what");
+    mr_msg(0, "is wrong. Please read it!                          -Devteam");
+    mr_msg(0, "-----------------------------------------------------------");
 
     mr_msg(0, "Zero...");
@@ -98 +92 @@
 }
 
-
-extern char *g_magicdev_command;
-
 /**
  * Do whatever is necessary to insure a successful backup on the Linux distribution
  * of the day.
  */
-void distro_specific_kludges_at_start_of_mondoarchive(void)
+static void distro_specific_kludges_at_start_of_mondoarchive(void)
 {
     mr_msg(2, "Unmounting old ramdisks if necessary");
@@ -120 +111 @@
  * Undo whatever was done by distro_specific_kludges_at_start_of_mondoarchive().
  */
-void distro_specific_kludges_at_end_of_mondoarchive(void)
+static void distro_specific_kludges_at_end_of_mondoarchive(void)
 {
     mr_msg(2, "Restarting magicdev if necessary");
@@ -133 +124 @@
     sync();
     unmount_boot_if_necessary();    // for Gentoo users
+}
+
+/* create the mr_ar_conf structure from mondo's conf file */
+static void mr_ar_store_conf(struct mr_ar_conf *mr_conf) {
+    
+    mr_asprintf(mr_conf->iso_creation_cmd, mr_conf_sread("mondo_iso_creation_cmd"));
+    mr_asprintf(mr_conf->iso_creation_options, mr_conf_sread("mondo_iso_creation_options"));
+    mr_asprintf(mr_conf->iso_burning_cmd, mr_conf_sread("mondo_iso_burning_cmd"));
+    mr_asprintf(mr_conf->iso_burning_options, mr_conf_sread("mondo_iso_burning_options"));
+    iso_burning_speed = mr_conf_iread("mondo_iso_burning_speed");
+    media_size = mr_conf_iread("mondo_media_size");
+    mr_asprintf(mr_conf->media_device, mr_conf_sread("mondo_media_device"));
+    manual_tray = mr_conf_bread("mondo_manual_tray");
+    log_level = mr_conf_iread("mondo_log_level");
+    mr_asprintf(mr_conf->prefix, mr_conf_sread("mondo_prefix"));
+    external_tape_blocksize = mr_conf_iread("mondo_external_tape_blocksize");
+    internal_tape_blocksize = mr_conf_iread("mondo_internal_tape_blocksize");
+    slice_size = mr_conf_iread("mondo_slice_size");
+    mr_asprintf(mr_conf->deplist_file, mr_conf_sread("mondo_deplist_file"));
+    write_boot_floppy = mr_conf_bread("mondo_write_boot_floppy");
+    create_mindi_cd = mr_conf_bread("mondo_create_mindi_cd");
+    mr_asprintf(mr_conf->kernel, mr_conf_sread("mondo_kernel"));
+    mr_asprintf(mr_conf->additional_modules, mr_conf_sread("mondo_additional_modules"));
+    mr_asprintf(mr_conf->boot_loader, mr_conf_sread("mondo_boot_loader"));
+    differential = mr_conf_bread("mondo_differential");
+    mr_asprintf(mr_conf->compression_tool, mr_conf_sread("mondo_compression_tool"));
+    compression_level = mr_conf_iread("mondo_compression_level");
+    mr_asprintf(mr_conf->exclude_paths, mr_conf_sread("mondo_exclude_paths"));
+    mr_asprintf(mr_conf->include_paths, mr_conf_sread("mondo_include_paths"));
+    mr_asprintf(mr_conf->ui_mode, mr_conf_sread("mondo_ui_mode"));
+    automatic_restore = mr_conf_bread("mondo_automatic_restore");
+    mr_asprintf(mr_conf->scratch_dir, mr_conf_sread("mondo_scratch_dir"));
+    mr_asprintf(mr_conf->tmp_dir, mr_conf_sread("mondo_tmp_dir"));
+    mr_asprintf(mr_conf->images_dir, mr_conf_sread("mondo_images_dir"));
 }
 
@@ -145 +170 @@
 int main(int argc, char *argv[])
 {
-    struct s_bkpinfo *bkpinfo;
+    struct s_bkpinfo *bkpinfo = NULL;
     struct stat stbuf;
     char *tmp = NULL;
@@ -157 +182 @@
     (void) textdomain("mondo");
 #endif
-/* Make sure I'm root; abort if not */
+    printf(_("Initializing..."));
+
+    /* initialize log file with time stamp */
+    /* We start with a loglevel of 4 - Adapted later on */
+    /* It's mandatory to set this up first as all mr_ functions rely on it */
+    unlink(MONDO_LOGFILE);
+    mr_msg_init(MONDO_LOGFILE,4);
+    mr_msg(0, _("Time started: %s"), mr_date());
+
+    /* Make sure I'm root; abort if not */
     if (getuid() != 0) {
-        fprintf(stderr, _("Please run as root.\n"));
-        exit(127);
+        mr_log_exit(127, _("Please run as root."));
     }
 
@@ -168 +201 @@
             || !strcmp(argv[argc - 1], "--version"))) {
         printf(_("mondoarchive v%s\nSee man page for help\n"), PACKAGE_VERSION);
-        exit(0);
-    }
+        mr_exit(0, NULL);
+    }
+
+    /* Conf file management */
+    /* Check md5 sum before */
+    /* Get content */
+    if (mr_conf_open(MONDO_CONF_DIR"/mondo.conf.dist") != 0) {
+            mr_log_exit(-1, "Unable to open "MONDO_CONF_DIR"/mondo.conf.dist");
+    }
+    mr_ar_store_conf(&mr_conf);
+    mr_conf_close();
+
+    /* Add MONDO_SHARE + other environment variables for mindi */
+    setenv_mondo_var();
 
     /* Initialize variables */
     malloc_libmondo_global_strings();
-
-    res = 0;
-    retval = 0;
     diffs = 0;
-
-    /* initialize log file with time stamp */
-    unlink(MONDO_LOGFILE);
-    mr_msg_init(MONDO_LOGFILE,4);
-    mr_msg(0, _("Initializing...\n"));
-    mr_msg(0, _("Time started: %s"), mr_date());
-
     bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
-
-    /* Add the ARCH environment variable for ia64 purposes */
-    setenv("ARCH", get_architecture(), 1);
-
-    /* Add MONDO_SHARE + other environment variables for mindi */
-    setenv_mondo_var();
-
     if (stat(MONDO_CACHE, &stbuf) != 0) {
         mr_mkdir(MONDO_CACHE,0x755);