Merge remote-tracking branch 'upstream/stable-0.15.x' into stable-0.15.x

Signed-off-by: Ste74 <stefano@manjaro.org>
This commit is contained in:
Ste74 2018-11-03 19:20:22 +01:00
commit f67dd8fbe0
No known key found for this signature in database
GPG key ID: 8DB9F8C18DF53602

View file

@ -178,6 +178,7 @@ assemble_iso(){
--sort-weight 0 / \ --sort-weight 0 / \
--sort-weight 1 /boot \ --sort-weight 1 /boot \
--grub2-mbr ${iso_root}/boot/grub/i386-pc/boot_hybrid.img \ --grub2-mbr ${iso_root}/boot/grub/i386-pc/boot_hybrid.img \
-iso_mbr_part_type 0x00 \
-partition_offset 16 \ -partition_offset 16 \
-b boot/grub/i386-pc/eltorito.img \ -b boot/grub/i386-pc/eltorito.img \
-c boot.catalog \ -c boot.catalog \
@ -186,12 +187,10 @@ assemble_iso(){
-append_partition 2 0xef ${iso_root}/efi.img \ -append_partition 2 0xef ${iso_root}/efi.img \
-e --interval:appended_partition_2:all:: \ -e --interval:appended_partition_2:all:: \
-no-emul-boot \ -no-emul-boot \
-full-iso9660-filenames \
-iso-level 3 \ -iso-level 3 \
-o ${iso_dir}/${iso_file} \ -o ${iso_dir}/${iso_file} \
${iso_root}/ ${iso_root}/
# arg to add with xorriso-1.4.7
# -iso_mbr_part_type 0x00
} }
# Build ISO # Build ISO