Changeset 2635 in MondoRescue for branches/2.2.10/mondo/src/include/my-stuff.h

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/include/my-stuff.h (modified) (1 diff)

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -174 +174 @@
 
 
-/**
- * @c mkisofs command to generate a nonbootable CD, except for -o option and the directory to image.
- */
-#define MONDO_MKISOFS_NONBOOT   "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+#define MONDO_MKISOFS "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version "
 
 /**
  * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_SYSLINUX  "mkisofs -J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 "
 
 /**
  * @c mkisofs command to generate a bootable CD using LILO, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_LILO      MONDO_MKISOFS_REGULAR_SYSLINUX
 
 /**
  * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
  */
-// Should replace 8192 by IA64_BOOT_SIZE
-#define MONDO_MKISOFS_REGULAR_ELILO      "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot."IA64_BOOT_SIZE".img -c boot.cat "
 
 /**