Changeset 2635 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

May 17, 2010, 5:57:40 AM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2586:2634 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9

• Avoids error messages from stat in analyze-my-lvm
• Avoid perl warning by removing non-exitent dirs from @INC in mindi-get-perl-modules r3744@localhost: bruno | 2010-03-16 01:44:33 +0100
  • Fix a bug on Mandriva modules analysis (at least) (Backport from mindi 2.1.0)
• Try to improve exclusion of binded /proc mount with "none" fs type exclusion Cf: #397
• Adds gmane mirror on the support page of the web site.
• More website improvements based on Tom Metro feedbacks
• Adds Nable ML archive
• For gmane prefer the threaded view to the blog one.
• Fix an initialization bug for network protocol in interactive mode (was NULL and not NFS by default)
• Put an explicit notice of MondoRescue's license: GPLv2 or later (as per Hugo's notice in sources)
• Adds tee to deplist
• Fix #412 by supporting grub-install.unsupported for OpenSuSE and solving an issue with the parameter passed to grub for device which should be a device name, not a partition.
• Fix #413 where list of devices was not re-initialized correctly in a loop (Michael Shapiro)
• Fix #415 by avoiding integration of unknown devices report from pvscan (Mike Shapiro)
• Fix #414 by adding a function GetPVsForLV to remove PVs from excluded LVs (Mike Shapiro)
• Fixes for #414: remove comments from grub conf file if used and improve grub conf file generation
• Fix a typo (Mike Shapiro)
• Improved msg for USB device creation
• Mondoarchive should not try to cerate a cmp binary if it doesn't exist.
• Fix a bug on ia64 where the boot image generated was removed before use in mondo
• Avoid to have multiple similar calls to mkisofs by using macros r3946@localhost: bruno | 2010-05-04 19:17:51 +0200
  • Solves an issue with usage of -V option in mkiofs wrongly placed
• netfs_proto should be initialized in every case, not just in DR (should solve remaining NULL reports)
• Integrate Michael Shapiro's patch on Xen Kernel support for RHEL 5 (only atm) and fixes #418 (Michael Shapiro)
• Fox a typo in a Web page
• Precise that GPL is v2+ (as per Hugo's wish)
• Improve display of messages (removes extra \n) and replace a stract with "" with " ". trying to debug #421
• Remove a wrong usage of mr_strcat with exclude_path in the 2.2.9 version (probably cause of #421)
• Fix strcat call !

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (3 diffs)

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

@@ -514 +514 @@
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS);
         } else if
 #ifdef __FreeBSD__
@@ -523 +523 @@
 #ifdef __IA64__
     {
-        mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
-        else {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+        else
+        {
+            mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
 
@@ -950 +951 @@
     }
 
-    tmp = find_home_of_exe("cmp");
-    if (!tmp) {
-        mr_free(tmp);
-        tmp = find_home_of_exe("true");
-        if (!tmp) {
-            retval += whine_if_not_found("cmp");
-        } else {
-            log_to_screen("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
-            if (run_program_and_log_output("cp -f `which true` /usr/bin/cmp", 0)) {
-                mr_free(tmp);
-                fatal_error("Failed to create dummy 'cmp' file.");
-            }
-        }
-    }
-    mr_free(tmp);
+    if (!find_home_of_exe("cmp")) {
+        whine_if_not_found("cmp");
+    }
 
     run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);