# HG changeset patch # User Pascal Bellard # Date 1475242985 -7200 # Node ID 6a5f1eda8d1b365ab10b3205657928cfd3b738e9 # Parent 2f785951bc3108a3d78476916948b289bf152ca6 uefi support aventually... (again) diff -r 2f785951bc31 -r 6a5f1eda8d1b tazlito --- a/tazlito Sun Sep 18 17:46:08 2016 +0200 +++ b/tazlito Fri Sep 30 15:43:05 2016 +0200 @@ -281,19 +281,14 @@ _ 'Generating %s' "$1" make_bzImage_hardlink $2/boot uefi="$(cd $2 ; ls boot/isolinux/*efi*img 2> /dev/null)" - genisoimage -R -o $1 -hide-rr-moved -b boot/isolinux/isolinux.bin \ - -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \ - ${uefi:+-eltorito-alt-boot -e $uefi -no-emul-boot} \ + genisoimage -R -o $1 -hide-rr-moved \ + -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table \ + ${uefi:+-eltorito-alt-boot -efi-boot $uefi -no-emul-boot} \ -V "${VOLUM_NAME:-SliTaz}" -p "${PREPARED:-$(id -un)}" \ -volset "SliTaz $SLITAZ_VERSION" -input-charset utf-8 \ -A "tazlito $VERSION/$(genisoimage --version)" \ - -copyright README -P "www.slitaz.org" -boot-info-table $2 - if [ -x '/usr/bin/isohybrid' ]; then - action 'Creating hybrid ISO...' - /usr/bin/isohybrid $1 -entry 2 2>/dev/null - status - fi - + -copyright README -P "www.slitaz.org" $2 if [ -s '/etc/tazlito/info' ]; then if [ $(stat -c %s /etc/tazlito/info) -lt $(( 31*1024 )) ]; then action 'Storing ISO info...' @@ -302,6 +297,12 @@ fi fi + if [ -x '/usr/bin/isohybrid' ]; then + action 'Creating hybrid ISO...' + /usr/bin/isohybrid $1 -entry 2 2>/dev/null + status + fi + if [ -x '/usr/bin/iso2exe' ]; then echo 'Creating EXE header...' /usr/bin/iso2exe $1 2>/dev/null