# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1550846263 -3600
# Node ID 8b4447362fc35ecbb59aa39740aafb7955c3878a
# Parent  2cb24e6379d54e8e18932ed57988b385ae59c043
syslinux: fix iso2exe

diff -r 2cb24e6379d5 -r 8b4447362fc3 syslinux/stuff/iso2exe/Makefile
--- a/syslinux/stuff/iso2exe/Makefile	Fri Feb 22 12:22:33 2019 +0100
+++ b/syslinux/stuff/iso2exe/Makefile	Fri Feb 22 15:37:43 2019 +0100
@@ -16,7 +16,7 @@
 iso2exe: iso2exe.sh boot.com bootiso.bin init.built win32.exe
 	cp iso2exe.sh $@
 	chmod +x $@
-	./$@ --build boot.com bootiso.bin init win32.exe
+	./$@ --build boot.com bootiso.bin win32.exe init
 
 init.built: bootloader.bin ifmem.bin init
 	./init --build
diff -r 2cb24e6379d5 -r 8b4447362fc3 syslinux/stuff/iso2exe/bootiso.S
--- a/syslinux/stuff/iso2exe/bootiso.S	Fri Feb 22 12:22:33 2019 +0100
+++ b/syslinux/stuff/iso2exe/bootiso.S	Fri Feb 22 15:37:43 2019 +0100
@@ -178,7 +178,7 @@
 	ret
 	.org	0x7E00
 
-	.org	0x7F81
+	.org	0x7F83
 ////////////////////////////// DOS EXE code ///////////////////////////////////
 
 exestart:
@@ -199,8 +199,7 @@
 	jc	tst386
 abort:
 goputs:
-	mov	$EXEADRS(puts), %si
-	jmp	%si
+	jmp	puts
 
 tst386:
 	pushw	%sp
diff -r 2cb24e6379d5 -r 8b4447362fc3 syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 12:22:33 2019 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 15:37:43 2019 +0100
@@ -152,7 +152,8 @@
 	x=$((512*(1+$(get 417 "$ISO" 1))))
 	[ $x -gt 32768 ] && x=6656
 	stub=$(($(get 20 "$ISO") - 0xC0))
-	[ $stub -gt 30000] && dosstub=$stub || dosstub=
+	dosstub=$stub
+	[ $stub -lt 30000 ] && stub=$((0x7FF0)) && dosstub=
 	c=$(custom_config_sector "$ISO")
 	SIZE=0; OFFSET=0
 	case "$1" in