diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-11-26 21:35:27 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-11-26 21:36:02 +0000 |
commit | 40d9bcb4e25b9525e9e325b9f011567dae2a9c6e (patch) | |
tree | 3ed3f41fca86e42e63e8eb89d92ccbedc370defd | |
parent | 3222b28b9a5b5e206cc512a48f3192843d93f432 (diff) | |
download | drakiso-40d9bcb4e25b9525e9e325b9f011567dae2a9c6e.tar drakiso-40d9bcb4e25b9525e9e325b9f011567dae2a9c6e.tar.gz drakiso-40d9bcb4e25b9525e9e325b9f011567dae2a9c6e.tar.bz2 drakiso-40d9bcb4e25b9525e9e325b9f011567dae2a9c6e.tar.xz drakiso-40d9bcb4e25b9525e9e325b9f011567dae2a9c6e.zip |
Improved control of isohybrid protective partition start and type.
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | lib/MGA/DrakISO/BuildISO.pm | 10 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,4 @@ +- improved control of isohybrid protective partition start and type - avoid full file path appearing in checksum files - undo accidental commit of changes to examples diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm index c905f1e..2711e4c 100644 --- a/lib/MGA/DrakISO/BuildISO.pm +++ b/lib/MGA/DrakISO/BuildISO.pm @@ -97,6 +97,12 @@ sub build_iso_image { my $iso_name = $build->get_name . '.iso'; + my $iso_part_start = $build->{media}{iso_part_start} || 0; + $iso_part_start == 0 || $iso_part_start == 1 + or die "ERROR: unsupported start sector for ISO protective partition\n"; + + my $iso_part_type = $build->{media}{iso_part_type} || '0x00'; + my $dest = $build_dir . '/' . $iso_name; my $xorriso_version = `xorriso -version 2> /dev/null | head -1`; @@ -130,8 +136,8 @@ sub build_iso_image { '--efi-boot', '--interval:appended_partition_2:all::', # for USB EFI boot '-part_like_isohybrid', - '-iso_mbr_part_type', '0x00', - if_($build->{media}{protect_sector_0} eq 'no', + '-iso_mbr_part_type', $iso_part_type, + if_($build->{media}{iso_part_start} == 1, '--protective-msdos-label', ), '-append_partition', 2, '0xef', $esp_image, |