Changeset 2603 in MondoRescue for branches/2.2.10/mondo

Timestamp:

Mar 22, 2010, 1:56:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3757@localhost: bruno | 2010-03-17 15:05:13 +0100

• Adds a new interface param between mondoarchive and mindi for backup-media-type which was missing
• Improve again logging
• Try to improve keymap support
• Remove some remaining hard coded /proc/cmdline
• Adds a cache for the find command for modules launched twice to make it quicker on my Atom netboot in a QEMU VM
• Remove dependency at build time on mindi to only use MINDI_CONF env var

Location:

branches/2.2.10/mondo

Files:

• configure.in (modified) (1 diff)
• deplist.d/Makefile.am (modified) (1 diff)
• src/common/libmondo-archive.c (modified) (2 diffs)
• src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/2.2.10/mondo/configure.in

@@ -49 +49 @@
 AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
 AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
+
+# We need to know where is mindi conf dir in order to add content to it
+if [ "_$MINDI_CONF" != "_" ]; then
+    export MINDI_CONF
+else
+    export MINDI_CONF=/usr/local/etc/mindi
+fi
+
 
 # ( which automake 2>/dev/null >/dev/null && ( automake --version 2>&1 | grep -q 1.5 || automake --version 2>&1 | grep -q 1.7 || AC_MSG_ERROR([Automake must be version 1.5 or 1.7, if you have it at all]) ) )

branches/2.2.10/mondo/deplist.d/Makefile.am

@@ -1 @@
-mindiconfdir = `mindi --printvar MINDI_CONF`
-deplistdir = $(mindiconfdir)/deplist.d
+conf=`if [ "_$(MINDI_CONF)" = "_" ]; then echo $(sysconfdir)/mindi; else echo $(MINDI_CONF); fi`
+deplistdir = $(conf)/deplist.d
 
-deplistdir_DATA = mondo.conf
+deplist_DATA = mondo.conf

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

@@ -757 +757 @@
         fatal_error("Unknown backup_media_type");
     }
-    mr_free(value);
 
     if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) {
@@ -808 +807 @@
             use_gzip_sz,        // parameter #19 (STRING)
             use_lzma_sz,        // parameter #20 (STRING)
+            value,              // parameter #21 (STRING)
             MONDO_LOGFILE);
 
+    mr_free(value);
     mr_free(tmp2);
     mr_free(tape_device);

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -214 +214 @@
 #endif
 
-    tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
+    tmp = call_program_and_get_last_line_of_output("cat "CMDLINE);
     if (strstr(tmp, "nolvm")) {
         mr_free(tmp);