Changeset 3498 in MondoRescue for branches

Timestamp:

Feb 8, 2016, 11:12:20 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Adds a mr_sys module for the mr_system function and a unit test

Location:

branches/3.2/mondo

Files:

• src/include/mr_sys.h (added)
• src/include/my-stuff.h (modified) (3 diffs)
• src/lib/Makefile.am (modified) (1 diff)
• src/lib/mr_sys.c (added)
• test/Makefile.am (modified) (1 diff)
• test/test-mr_system.c (added)

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

@@ -184 +184 @@
  * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b isolinux/isolinux.bin -c isolinux/boot.cat -boot-load-size 4 "
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -boot-load-size 4 "
 
 /**
@@ -204 +204 @@
  * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
  */
-#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux/isolinux.bin --boot-info-table -c isolinux/boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b syslinux/isolinux.bin --boot-info-table -c syslinux/boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
 
 /**
@@ -214 +214 @@
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */
-#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux/isolinux.bin -c isolinux/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**

branches/3.2/mondo/src/lib/Makefile.am

@@ -7 +7 @@
 noinst_LIBRARIES = libmr.a
 
-libmr_a_SOURCES  = mr_conf.c mr_str.c mr_mem.c mr_err.c mr_msg.c mr_file.c mr_list.c
+libmr_a_SOURCES  = mr_conf.c mr_str.c mr_mem.c mr_err.c mr_msg.c mr_file.c mr_list.c mr_sys.c

branches/3.2/mondo/test/Makefile.am

@@ -4 +4 @@
 ## The program
 mrtestdir                 = $(pkglibdir)/test
-mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc mrtest_str_substitute
+mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc mrtest_str_substitute mrtest_mr_system
+
 mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
 mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+
 mrtest_truncname_SOURCES  = test-truncname.c ${top_builddir}/src/common/libmondo-string.c
 mrtest_truncname_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+
 mrtest_stresc_SOURCES     = test-mr_stresc.c
 mrtest_stresc_LDADD       = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+
 mrtest_str_substitute_SOURCES = test-mr_str_substitute.c
 mrtest_str_substitute_LDADD   = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+
+mrtest_mr_system_SOURCES  = test-mr_system.c
+mrtest_mr_system_LDADD    = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@