wok-current rev 21472
Update syslinux/iso2exe/init for tazboot.exe
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Apr 30 21:40:22 2019 +0200 (2019-04-30) |
parents | dca10c877d95 |
children | 2d7b87d501a3 |
files | posixovl/receipt syslinux/stuff/iso2exe/init |
line diff
1.1 --- a/posixovl/receipt Tue Apr 30 17:55:19 2019 +0100 1.2 +++ b/posixovl/receipt Tue Apr 30 21:40:22 2019 +0200 1.3 @@ -31,6 +31,7 @@ 1.4 # Rules to gen a SliTaz package suitable for Tazpkg. 1.5 genpkg_rules() 1.6 { 1.7 - mkdir -p $fs/usr/sbin 1.8 - cp $src/mount.posixovl $fs/usr/sbin 1.9 + mkdir -p $fs/usr/sbin $install/usr/share/man/man1 1.10 + cp $src/mount.posixovl $fs/usr/sbin 1.11 + cp $src/posixovl.1 $install/usr/share/man/man1 1.12 }
2.1 --- a/syslinux/stuff/iso2exe/init Tue Apr 30 17:55:19 2019 +0100 2.2 +++ b/syslinux/stuff/iso2exe/init Tue Apr 30 21:40:22 2019 +0200 2.3 @@ -126,14 +126,16 @@ 2.4 gettazboot() 2.5 { 2.6 echo "Creating $(basename $1) ..." 2.7 + X=$(($(get 20 /mnt/$ISO) - 0xC0)) 2.8 + [ $X -lt 30000 ] && X=$((0x7FF0)) 2.9 O=$(($(get 64 /mnt/$ISO) - 0xC0)) 2.10 - L=$(($(get 20 /mnt/$ISO) - 0xC0 - $(get 24 /mnt/$ISO) - $O)) 2.11 + L=$(($X - $(get 24 /mnt/$ISO) - $O)) 2.12 S=$((32+$L)) 2.13 P=$((($S+511)/512)) 2.14 E=$((4096-(32*$P))) 2.15 words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 $((${2:-0}-16)) \ 2.16 -2 0 256 -16 28 0x6C53 0x5469 0x7A61 > $1 2.17 - ddq bs=1 count=$L skip=$(echo $O) if=/mnt/$ISO >> $1 2.18 + ddq bs=1 count=$(echo $L) skip=$(echo $O) if=/mnt/$ISO >> $1 2.19 } 2.20 2.21 checkmagic() 2.22 @@ -228,6 +230,7 @@ 2.23 2.24 mkinitrd() 2.25 { 2.26 + echo 2.27 dotwait "Creating $(basename $1) " 2.28 for i in bin lib dev proc tmp mnt etc ; do 2.29 mkdir -p /tmp/fs/$i 2.30 @@ -268,7 +271,7 @@ 2.31 arg subroot "Change root to directory" 2.32 mount.posixovl -F /mnt/\$val -- -oallow_other -odefault_permissions -osuid 2.33 mount --bind /mnt /mnt/\$val/mnt/dos 2.34 -mount -o size=0 -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val 2.35 +mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val 2.36 LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q) 2.37 export LD_LIBRARY_PATH=\$val/lib:\$val/usr/lib:/lib 2.38 [ "$debug" = "true" ] && sh 2.39 @@ -339,7 +342,7 @@ 2.40 /media/cdrom/README /media/cdrom/boot/memtest* ; do 2.41 [ -s $i ] && cp $i /mnt/slitaz/boot 2.42 done 2.43 - for i in /mnt/slitaz/boot/memtest /mnt/slitaz/boot/*pxe* ; do 2.44 + for i in /mnt/slitaz/boot/memtest /mnt/slitaz/boot/*pxe ; do 2.45 [ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] && 2.46 mv $i $i.exe 2.47 done