summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-05-22 21:07:17 +0300
committerThomas Backlund <tmb@mageia.org>2015-05-22 21:07:17 +0300
commit05ff91fe4c881e4e7f0604c4b57450a09a6a106d (patch)
tree7158a36845243c6db71ef819b93a8ebea211c36a
parentcad8fb1ec20cfae4bbcad281aaecea9be7ae120a (diff)
downloaddraklive-05ff91fe4c881e4e7f0604c4b57450a09a6a106d.tar
draklive-05ff91fe4c881e4e7f0604c4b57450a09a6a106d.tar.gz
draklive-05ff91fe4c881e4e7f0604c4b57450a09a6a106d.tar.bz2
draklive-05ff91fe4c881e4e7f0604c4b57450a09a6a106d.tar.xz
draklive-05ff91fe4c881e4e7f0604c4b57450a09a6a106d.zip
use xorriso for proper efi metadata
-rw-r--r--NEWS1
-rwxr-xr-xdraklive6
2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 8191830..61e0f9a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- use xorriso for proper efi metadata
- add noiswmd on kernel command line
- add efiboot.img on x86_64 isos
- add missing isolinux menu files
diff --git a/draklive b/draklive
index fdd674d..60de35c 100755
--- a/draklive
+++ b/draklive
@@ -738,14 +738,14 @@ sub build_iso_image {
$in_progress = 0;
}
},
- 'genisoimage', '-pad', '-l', '-R', '-J',
+ 'xorriso', '-as', 'mkisofs', '-pad', '-l', '-R', '-J',
'-V', $label, #'-A', $application, '-p', $preparer, '-P', $publisher,
'-b', 'isolinux/isolinux.bin',
'-c', 'isolinux/boot.cat',
'-hide-rr-moved', '-no-emul-boot',
'-boot-load-size', 4, '-boot-info-table',
'-graft-points',
- if_($live->{settings}{arch} =~ /x86_64/, '-eltorito-alt-boot', '-b', 'boot/efiboot.img', '-no-emul-boot'),
+ if_($live->{settings}{arch} =~ /x86_64/, '-eltorito-alt-boot', '-e', 'boot/efiboot.img', '-no-emul-boot'),
if_($dest, '-o', $dest),
'isolinux=' . $live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux',
'isolinux/isolinux.cfg=' . $isolinux_cfg,
@@ -757,7 +757,7 @@ sub build_iso_image {
'isolinux/libmenu.c32=/usr/lib/syslinux/libmenu.c32',
'isolinux/libutil.c32=/usr/lib/syslinux/libutil.c32',
@opts,
- ) or die "unable to run genisoimage\n";
+ ) or die "unable to run xorriso\n";
autoflush STDOUT 0;
$progress->end;
if ($dest) {