# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1475310718 -7200
# Node ID 087d71ec38ce7eef2ea8f55cf9bf29f012027a8b
# Parent  15ddac90176811fa0cf3fe503a7450de3e5a33dc
syslinux/isohybrid: random uuid in gpt

diff -r 15ddac901768 -r 087d71ec38ce syslinux-extra/receipt
--- a/syslinux-extra/receipt	Sat Oct 01 09:40:12 2016 +0300
+++ b/syslinux-extra/receipt	Sat Oct 01 10:31:58 2016 +0200
@@ -20,9 +20,9 @@
     cp -a $src/mbr/mbr.bin $fs/usr/share/boot
     cp -a $src/mbr/gptmbr.bin $fs/usr/share/boot
     lzma e $src/core/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma 2> /dev/null
-    #lzma e $src/com32/menu/vesamenu.c32 $fs/usr/share/boot/vesamenu.c32.lzma
-    #lzma e $src/com32/modules/mboot.c32 $fs/usr/share/boot/mboot.c32.lzma
-    cp $src/com32/modules/sdi.c32 $fs/usr/share/boot/
+    #lzma e $src/com32/menu/vesamenu.c32 $fs/usr/share/boot/vesamenu.c32
+    #lzma e $src/com32/modules/mboot.c32 $fs/usr/share/boot/mboot.c32
+    lzma e $src/com32/modules/sdi.c32 $fs/usr/share/boot/sdi.c32
     cp -a $src/linux/syslinux-nomtools $fs/bin/syslinux
     cp -a $src/extlinux/extlinux $fs/bin
     cp -a $src/isohybrid.sh $fs/usr/bin/isohybrid
diff -r 15ddac901768 -r 087d71ec38ce syslinux-modules/receipt
--- a/syslinux-modules/receipt	Sat Oct 01 09:40:12 2016 +0300
+++ b/syslinux-modules/receipt	Sat Oct 01 10:31:58 2016 +0200
@@ -18,7 +18,7 @@
 	case "$i" in
 	*/reboot.c32|*/ifmem.c32|*/vesamenu.c32) continue;;
 	esac
-	lzma e $i $fs/usr/share/boot/$(basename $i).lzma 2> /dev/null
+	lzma e $i $fs/usr/share/boot/$(basename $i) 2> /dev/null
     done
     for i in $src/modules/*.com ; do
 	case "$i" in
diff -r 15ddac901768 -r 087d71ec38ce syslinux/stuff/iso2exe/bootiso.S
--- a/syslinux/stuff/iso2exe/bootiso.S	Sat Oct 01 09:40:12 2016 +0300
+++ b/syslinux/stuff/iso2exe/bootiso.S	Sat Oct 01 10:31:58 2016 +0200
@@ -123,6 +123,7 @@
 
 exestart:
 	cld
+	movw	$EXEADRS(puts), %bp	
 	movw	129, %ax
 	cmpb	$0x2F, %al
 	je	ishelp
@@ -137,8 +138,7 @@
 	movw	$0x1000+EXESTR(noDOS3), %ax
 	jc	tst386
 abort:
-jputs:
-	jmp	puts
+	jmp	%bp
 
 tst386:
 	pushfw				// save flags
@@ -166,7 +166,7 @@
 	inc	%ax
 	//movb	$EXESTR(realmodemsg), %al
 realmode:
-	call	jputs
+	call	%bp
 is86:
 	movw	comstart-end_header(%di), %si		// .com address
 	pushw	%di
@@ -175,6 +175,20 @@
 	movsw
 	ret
 
+CallVPCI:
+	int	$0x67
+	testb	%ah, %ah
+	xchgw	%ax, %cx
+	pusw	%si
+ScanVCPI:
+	popw	%si
+ChkVCPI:
+NoVCPI:
+	movb	$EXESTR(ERRvcpi), %al
+	jne	abort
+	lodsb
+	shlw	$8, %ax
+	jne	CallVCPI
 VersionVCPI:
 	xchgw	%ax, %si		// movb	$EXESTR(vm86modemsg), %al
 	cmpb	$0x40, %cl		// EMM386 / VCPI 4.0 mini
@@ -189,19 +203,8 @@
 	lodsw
 	popw	%ds
 	jne	NoVCPI
-	xorw	$0x5858, %ax		// XX(X0)
-	movw	$EXEADRS(CmdVCPI), %si
-ChkVCPI:
-NoVCPI:
-	movb	$EXESTR(ERRvcpi), %al
-	jne	abort
-	lodsb
-	shlw	$8, %ax
-	je	VersionVCPI
-	int	$0x67
-	testb	%ah, %ah
-	xchgw	%ax, %cx
-	jmp	ChkVCPI
+	xorb	$0x58, %al		// X(XX0)
+	call	ScanVCPI
 CmdVCPI:
 	.byte	0x40			// status
 	.byte	0xDE			// vcpi present ?
diff -r 15ddac901768 -r 087d71ec38ce syslinux/stuff/tools/isohybrid.sh
--- a/syslinux/stuff/tools/isohybrid.sh	Sat Oct 01 09:40:12 2016 +0300
+++ b/syslinux/stuff/tools/isohybrid.sh	Sat Oct 01 10:31:58 2016 +0200
@@ -202,12 +202,10 @@
 		store32 $((446+16+12)) $efi_len
 		uudecode <<EOT | unlzma | ddq bs=512 seek=1 of=$iso conv=notrunc
 begin-base64 644 -
-XQAAgAD//////////wAikYVN1N2VY3JXMnUMJn1RCdQOHHdkT27O1I77zn8t
-AiDDPDQv3ovn0t2ksyOkm/KVCwPcaMYXgukPNUeg8Tbavo+kXx/HVFkHHHB+
-c4gUdeTmJ31kL/btVwMG38di4lFL7bpUU61H7P0wJfcUrv0LYsPoW28D5f8s
-kaLvWB73gnnsIUYI9VNL4S9txwz2cCL67LZYGGAqMBdtdnp8Jv9qm36wvqJZ
-Bne0qEprzeTBrUFK74YLSrVbxK/fa6rz5pQxkLvyOVz4VfRMsVEA1G9IjF//
-BXwoAA==
+XQAAgAD//////////wAikYVN1N2VY3JXMnUMJn1RCdQOHN33EegtIBhrUQ7Q
+JNaW37NYVuUAmqtISPiCdgAxPRlBS0xDlmAPPOCSZXmEFz9jEkXSzmsGn6+o
+7SMAKMfvpMa3U1bJv/napT+/NFttJSJSx0xJA3em3KJcZsO66vaYeJC5tE+3
+T0p9AJtSH6X8SMic3vU3hYWwHsYnsmeoGmsy4EJba9Wf/0liMQA=
 ====
 EOT
 		lastlba=$((($cylinders * $heads * $sectors) -1))
@@ -223,6 +221,10 @@
 		store32 $((0x210)) $(crc32 0x200 $(read32 0 $((0x20C))))
 		store32sw $((0x1008)) $(($efi_ofs/4))
 		store32sw $((0x1054)) $(($efi_len/4))
+		for i in 238 410 490 ; do
+			ddq if=/dev/urandom count=16 bs=1 conv=notrunc \
+			    of=$iso seek=$((0x$i))
+		done
 	fi
 }