# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1556653222 -7200
# Node ID d3d2872880f07289740decc5659f709f55eaa4a6
# Parent  dca10c877d95a08d67180dfbd6109d129cc09a1a
Update syslinux/iso2exe/init for tazboot.exe

diff -r dca10c877d95 -r d3d2872880f0 posixovl/receipt
--- a/posixovl/receipt	Tue Apr 30 17:55:19 2019 +0100
+++ b/posixovl/receipt	Tue Apr 30 21:40:22 2019 +0200
@@ -31,6 +31,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/sbin
-	cp $src/mount.posixovl $fs/usr/sbin 
+	mkdir -p $fs/usr/sbin $install/usr/share/man/man1
+	cp $src/mount.posixovl $fs/usr/sbin
+	cp $src/posixovl.1 $install/usr/share/man/man1
 }
diff -r dca10c877d95 -r d3d2872880f0 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Tue Apr 30 17:55:19 2019 +0100
+++ b/syslinux/stuff/iso2exe/init	Tue Apr 30 21:40:22 2019 +0200
@@ -126,14 +126,16 @@
 gettazboot()
 {
 	echo "Creating $(basename $1) ..."
+	X=$(($(get 20 /mnt/$ISO) - 0xC0))
+	[ $X -lt 30000 ] && X=$((0x7FF0))
 	O=$(($(get 64 /mnt/$ISO) - 0xC0))
-	L=$(($(get 20 /mnt/$ISO) - 0xC0 - $(get 24 /mnt/$ISO) - $O))
+	L=$(($X - $(get 24 /mnt/$ISO) - $O))
 	S=$((32+$L))
 	P=$((($S+511)/512))
 	E=$((4096-(32*$P)))
 	words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 $((${2:-0}-16)) \
 			-2 0 256 -16 28 0x6C53 0x5469 0x7A61 > $1
-	ddq bs=1 count=$L skip=$(echo $O) if=/mnt/$ISO >> $1
+	ddq bs=1 count=$(echo $L) skip=$(echo $O) if=/mnt/$ISO >> $1
 }
 
 checkmagic()
@@ -228,6 +230,7 @@
 
 mkinitrd()
 {
+	echo
 	dotwait "Creating $(basename $1) "
 	for i in bin lib dev proc tmp mnt etc ; do
 		mkdir -p /tmp/fs/$i
@@ -268,7 +271,7 @@
 arg subroot "Change root to directory"
 mount.posixovl -F /mnt/\$val -- -oallow_other -odefault_permissions -osuid
 mount --bind /mnt /mnt/\$val/mnt/dos
-mount -o size=0 -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val
+mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val
 LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q)
 export LD_LIBRARY_PATH=\$val/lib:\$val/usr/lib:/lib
   [ "$debug" = "true" ] && sh
@@ -339,7 +342,7 @@
 		/media/cdrom/README /media/cdrom/boot/memtest* ; do
 		[ -s $i ] && cp $i /mnt/slitaz/boot
 	done
-	for i in /mnt/slitaz/boot/memtest /mnt/slitaz/boot/*pxe* ; do
+	for i in /mnt/slitaz/boot/memtest /mnt/slitaz/boot/*pxe ; do
 		[ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] &&
 		mv $i $i.exe
 	done