Changeset 3648 in MondoRescue for branches/3.3

Timestamp:

Jan 17, 2017, 2:38:23 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Adds mr-mksio script to generate the correct command to build an ISO image

Location:

branches/3.3

Files:

• MondoRescue/Makefile.PL (modified) (1 diff)
• MondoRescue/bin/mr-mkiso (added)
• MondoRescue/etc/mondorescue.conf (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)

branches/3.3/MondoRescue/Makefile.PL

@@ -18 +18 @@
     EXE_FILES    => [ qw( bin/mr-analyze-lvm 
                 bin/mr-check-lvm 
+                bin/mr-device-mounted
                 bin/mr-disk-list
                 bin/mr-disk-type
-                bin/mr-device-mounted
+                bin/mr-distro-getparam
+                bin/mr-getparam
+                bin/mr-kernel-get-modules
+                bin/mr-label
+                bin/mr-mkiso
+                bin/mr-net-get-config
                 bin/mr-process-ldd
                 bin/mr-read-all-link
-                bin/mr-kernel-get-modules
-                bin/mr-net-get-config
-                bin/mr-label
-                bin/mr-getparam
-                bin/mr-distro-getparam
                 ) ],
 );

branches/3.3/MondoRescue/etc/mondorescue.conf

@@ -73 +73 @@
 mr_cmd_dmidecode linux = /usr/sbin/dmidecode
 mr_cmd_lshw linux = /usr/sbin/lshw
-# Pb of key here want both linux and mrmini or mondoarchive or ...
-mr_cmd_mkiso linux = /usr/bin/mkisofs
-mr_opt_mkiso linux = -J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue
-mr_cmd_mkiso mageia = /usr/bin/xorriso
-
+#
+# Management of ISO images and their burning on media
+#
+# ISO mode can be mkisofs or xorriso or best (xorriso used first if found, then mkisofs)
+mr_iso_mode default = best
+# parameters can use the mr_cmd_mode, mr_opt_gen_mode, mr_opt_mindi_mode, mr_opt_mr_mode options to configure it
+mr_cmd_mkisofs default = /usr/bin/genisoimage
+mr_cmd_mkisofs linux = /usr/bin/genisoimage
+mr_cmd_mkisofs mageia = /usr/bin/genisoimage
+mr_cmd_xorriso linux = /usr/bin/xorriso
+#
+mr_opt_gen_xorriso linux = -joliet on -rockridge on -publisher http://www.mondorescue.org -volset-size 1 -volset-seqno MRSEQNO
+mr_opt_gen_mkisofs linux = -J -r -v -publisher http://www.mondorescue.org -volset-size 1 -volset-seqno MRSEQNO
+#
+mr_opt_mindi_xorriso linux = -application_id Mindi -preparer_id Mindi -volid MINDI-MEDIA -volset_id MINDI-MEDIA
+mr_opt_mindi_mkisofs linux = -A Mindi -p Mindi -V MINDI-MEDIA -volset MINDI-MEDIA
+#
+mr_opt_mr_xorriso linux = -application_id MondoRescue -preparer_id MondoRescue -volid MONDORESCUE-MEDIA -volset_id MONDORESCUE-MEDIA
+mr_opt_mr_mkisofs linux = -A MondoRescue -p MondoRescue -V MONDORESCUE-MEDIA -volset MONDORESCUE-MEDIA
 #
 # Interface to burner
 #
-mr_cmd_burn default = /usr/bin/wodim
-#mr_cmd_burn default = /usr/bin/cdrecord
-mr_opt_burn default = -v
+# Burn mode can be cdrecord or xorriso or best (xorriso used first if found, then cdrecord)
+mr_burn_mode default = cdrecord
+#mr_cmd_cdrecord default = /usr/bin/cdrecord
+mr_cmd_cdrecord default = /usr/bin/wodim
+mr_opt_cdrecord default = -v
 
 # 

branches/3.3/mondo/src/common/libmondo-devices.c

@@ -3018 +3018 @@
     mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     if (!mountdev[0]) {
-        log_it
-            ("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
+        log_it("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
         find_cdrom_device(bkpinfo->media_device, FALSE);
     }