Changeset 1535 in MondoRescue

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.

Location:

branches/stable

Files:

• mindi/distributions/conf/mindi.conf.dist (modified) (1 diff)
• mindi/mindi (modified) (3 diffs)
• mondo/distributions/conf/mondo.conf.dist (modified) (3 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/include/mr_conf.h (modified) (2 diffs)
• mondo/src/lib/mr_conf.c (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (3 diffs)
• tools/backupqemu (modified) (1 diff)
• tools/restoreqemu (modified) (1 diff)

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -170 +170 @@
 "
 
+#
+# Options common between mindi and mondo are stored below
+#
+
+#
+# ISO image CLI command to use 
+# For mindi options are fixed and based on mkisofs options
+# Potentially overwritten by monoarchive values
+#
+mr_iso_creation_cmd="/usr/bin/mkisofs"
+#mindi_iso_creation_cmd="/usr/bin/growisofs"
+
+#
+# ISO image common creation options (for mkisofs/growisofs/wodim)
+# do not specify the -o, -c or the -b options, nor the directory to backup
+# as they will be generated by mondoarchive
+#
+mr_iso_creation_opt="-J -r -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue"
+#mr_iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue -V _CD#_"

branches/stable/mindi/mindi

@@ -109 +109 @@
 NET_MODS="$mindi_net_mods"
 EXTRA_MODS="$CDROM_MODS $mindi_extra_mods $mindi_additional_mods"
-DENY_MODS="mindi_deny_mods"
-FORCE_MODS="mindi_force_mods"
+DENY_MODS="$mindi_deny_mods"
+FORCE_MODS="$mindi_force_mods"
+ISO_CMD="$mr_iso_creation_cmd"
+ISO_OPT="$mr_iso_creation_opt"
 
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
@@ -1617 +1619 @@
             cp -f $MONDO_SHARE/autorun . 2>> $LOGFILE
         fi
-        mkisofs -U -J -r -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
-    else
-        mkisofs -J -r -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
+    else
+        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     fi
     if [ "$?" -ne "0" ] ; then
-        echo "----------- mkisofs's errors --------------" >> $LOGFILE
+        echo "----------- $ISO_CMD's errors --------------" >> $LOGFILE
         cat $MINDI_TMP/mkisofs.log >> $LOGFILE
-        echo "mkisofs returned the following errors:-"
+        echo "$ISO_CMD returned the following errors:-"
         cat $MINDI_TMP/mkisofs.log
         LogIt "Failed to create ISO image."
@@ -2907 +2909 @@
     shift
     if [ _"$1" != _"" ] ; then
-        set | egrep "^$1" | cut -d= -f2
+        set | grep -Ew "^$1" | cut -d= -f2
     fi
     MindiExit 0

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

@@ -4 +4 @@
 #
 # We tried to give sensible defaults in this file.
-# It will alwys be loaded by mondoarchive before your own configuration files.
+# It will always be loaded by mondoarchive before your own configuration files.
 # DO NOT CHANGE THAT FILE IN ANYWAY AS ITS MD5 SUM IS USED AS A CHECK !!
 # Anyway changing some values in your own configuration file may render
 # mondoarchive instable or cause failures. Use with care.
-
-#
-# ISO image CLI command to use 
-# do not specify the -o, -c or the -b options, nor the directory to backup
-# as they will be generated by mondoarchive
-#
-mondo_iso_creation_cmd="/usr/bin/mkisofs"
-#mondo_iso_creation_cmd="/usr/bin/growisofs"
-
-#
-# ISO image common creation options (for mkisofs and growisofs)
-# do not specify the -o, -c or the -b options, nor the directory to backup
-#
-mondo_iso_creation_options="-J -r -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue -V _CD#_"
-#mondo_iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue -V _CD#_"
 
 #
@@ -30 +15 @@
 
 #
-#  ISO Burning CLI command options
+# ISO Burning CLI command options
 mondo_iso_burning_options="-eject dev=_DEVICE_ speed=_SPEED_ fs=24m driveropts=burnfree"
 
@@ -41 +26 @@
 # Default size of media
 #
-# Use 4380 for DVDs, 650 or 700 for CDs
+# Use 4480 for DVDs, 650 or 700 for CDs
 #
 mondo_media_size=4480

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

branches/stable/tools/backupqemu

@@ -33 +33 @@
 
 d=/users/svg
-mkdir -p \$d
-mount ${iph}:$demodir \$d
-mkdir -p \$d/tmp-$h \$d/scratch-$h \$d/images
-/usr/sbin/mondoarchive -n ${iph}:$demodir -G -F -N -O -E "/usr/share/doc /usr/src /home /users /var/log" -d images -s 4300m -T \$d/tmp-$h -S \$d/scratch-$h -p $h-$m
-umount \$d
+mkdir -p \$d/images
+mount ${iph}:$demodir \$d/images
+mkdir -p \$d/tmp-$h \$d/scratch-$h
+/usr/sbin/mondoarchive -n ${iph}:$demodir -G -F -N -O -E "/usr/share/doc /usr/src /home /users /var/log" -d images -s 650m -T \$d/tmp-$h -S \$d/scratch-$h -p $h-$m
+umount \$d/images
 EOF
 chmod 755 $TMPDIR/test-mondo

branches/stable/tools/restoreqemu

@@ -19 +19 @@
 . $TOOLHOME/qemu-env
 
+if [ _"$1" = _"" ]; then
+    echo "Syntax: restoreqemu vm"
+    exit -1
+else
+    m=$1
+fi
+
 demodir=/home/bruno/demo-mondo
 
 
 QEMUOPT=" $QEMUOPT -kernel $demodir/k -initrd $demodir/i"
-QEMUAPP="load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=65536 rw root=/dev/ram iso_mode nuke pxe prefix=test-mondo-$m ipconf=eth0:dhcp nfsmount=10.0.2.2:$demodir"
+QEMUAPP="load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=65536 rw root=/dev/ram iso_mode pxe prefix=test-mondo-$m ipconf=eth0:dhcp nfsmount=10.0.2.2:$demodir"
 
 cp $demodir/pxe.qemu $demodir/test.qemu