tazlito diff tazlito @ rev 436
uefi support aventually... (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Sep 30 15:43:05 2016 +0200 (2016-09-30) |
parents | c53dcc8b4370 |
children | 338b35b61749 |
line diff
1.1 --- a/tazlito Sun Sep 18 10:05:38 2016 +0200 1.2 +++ b/tazlito Fri Sep 30 15:43:05 2016 +0200 1.3 @@ -281,19 +281,14 @@ 1.4 _ 'Generating %s' "$1" 1.5 make_bzImage_hardlink $2/boot 1.6 uefi="$(cd $2 ; ls boot/isolinux/*efi*img 2> /dev/null)" 1.7 - genisoimage -R -o $1 -hide-rr-moved -b boot/isolinux/isolinux.bin \ 1.8 - -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \ 1.9 - ${uefi:+-eltorito-alt-boot -e $uefi -no-emul-boot} \ 1.10 + genisoimage -R -o $1 -hide-rr-moved \ 1.11 + -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \ 1.12 + -no-emul-boot -boot-load-size 4 -boot-info-table \ 1.13 + ${uefi:+-eltorito-alt-boot -efi-boot $uefi -no-emul-boot} \ 1.14 -V "${VOLUM_NAME:-SliTaz}" -p "${PREPARED:-$(id -un)}" \ 1.15 -volset "SliTaz $SLITAZ_VERSION" -input-charset utf-8 \ 1.16 -A "tazlito $VERSION/$(genisoimage --version)" \ 1.17 - -copyright README -P "www.slitaz.org" -boot-info-table $2 1.18 - if [ -x '/usr/bin/isohybrid' ]; then 1.19 - action 'Creating hybrid ISO...' 1.20 - /usr/bin/isohybrid $1 -entry 2 2>/dev/null 1.21 - status 1.22 - fi 1.23 - 1.24 + -copyright README -P "www.slitaz.org" $2 1.25 if [ -s '/etc/tazlito/info' ]; then 1.26 if [ $(stat -c %s /etc/tazlito/info) -lt $(( 31*1024 )) ]; then 1.27 action 'Storing ISO info...' 1.28 @@ -302,6 +297,12 @@ 1.29 fi 1.30 fi 1.31 1.32 + if [ -x '/usr/bin/isohybrid' ]; then 1.33 + action 'Creating hybrid ISO...' 1.34 + /usr/bin/isohybrid $1 -entry 2 2>/dev/null 1.35 + status 1.36 + fi 1.37 + 1.38 if [ -x '/usr/bin/iso2exe' ]; then 1.39 echo 'Creating EXE header...' 1.40 /usr/bin/iso2exe $1 2>/dev/null