# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1639994711 0
# Node ID dbc597fbeee59d00d09974970cfb4ca02b90b5d5
# Parent  072e916363627b96f26752b8256145462c20f9a2
Up ventoy (1.0.62)

diff -r 072e91636362 -r dbc597fbeee5 linld/receipt
--- a/linld/receipt	Sat Dec 11 19:18:13 2021 +0000
+++ b/linld/receipt	Mon Dec 20 10:05:11 2021 +0000
@@ -36,12 +36,13 @@
 EOT
 	SDL_VIDEODRIVER=dummy dosbox MAKE.BAT -exit -c "mount D $src" \
 		2>&1 | grep -v 'ALSA lib'
+	dos2unix */*.[LM]*
 	grep '^Fatal[ :]' */LNK.LOG */CPP.LOG && return 1
-	grep '*Fatal*' */*.LST && return 1
+	grep '\*Fatal\*' */*.LST && return 1
 	grep '^Error[ :]' */LNK.LOG */CPP.LOG && return 1
-	grep '*Error*' */*.LST && return 1
+	grep '\*Error\*' */*.LST && return 1
 	grep '^Warning[ :]' */LNK.LOG */CPP.LOG
-	grep '*Warning*' */*.LST
+	grep '\*Warning\*' */*.LST
 	cp LINLD$SUFFIX/LINLD.COM linld.com
 	objdump -D -b binary -mi386 -Maddr16,data16 --adjust-vma=0x100 \
 		linld.com > linld.lst
diff -r 072e91636362 -r dbc597fbeee5 linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Sat Dec 11 19:18:13 2021 +0000
+++ b/linld/stuff/src/_BEG.ASM	Mon Dec 20 10:05:11 2021 +0000
@@ -139,18 +139,16 @@
 ;***************************************************************
 
 ; Check for oldies
-		ifdef	NO386
 		ifdef	CPUTYPE
-		mov	ax,100h
-		mov	cl,32		; 186+ masks with 31
-		shr	ax,cl
-		endif
+		mov	ax,bx
+		mov	cl,32+7		; 186+ masks with 31
+		shr	ah,cl
 		endif
 		push	bx		; < 286 : flags[12..15] are forced 1
 		popf			; = 286 : flags[12..15] are forced 0, cld, cli
 		pushf			; > 286 : only flags[15] is forced 0
 		pop	dx
-		add	dh,bh		; 160:NS=386+, 0F0:NC=286, 1E0:NP=86/186
+		add	dh,bh		; 160:NS=386+, 0F0:NC=286, 1E0:PO=86/186
 		ifndef	NO386
 		mov	bx,offset msg_badcpu
                 js	godie   	;it is not a 386+, die
@@ -167,11 +165,11 @@
                 p386
 		ifdef	VCPI
                 mov     edx,cs
-                shl     edx,4		; edx for prepare_vcpi (edx[31-20]=0)
+                shl     edx,4		; edx for prepare_vcpi (edx[31-20]=0) [1]
 		else
  		 ifndef	LARGE_ZIMAGE
                 mov     edx,cs
-                shl     edx,4		; edx for memcpy32 (edx[31-20]=0)
+                shl     edx,4		; edx for memcpy32 (edx[31-20]=0) [1]
 		 endif
 		endif
 		ifndef	LARGE_ZIMAGE
@@ -197,7 +195,7 @@
 		call	near die
 		else
 jmp_endcpu86:
-		jmp	endcpu86	;386+ rm will fake 186
+		jmp	endcpu86	;386+ rm will fake 186+
 		endif
 
 
@@ -209,10 +207,8 @@
 		ifdef	VCPI
 ; Check whether it is safe to call 67h
 		xor	eax,eax
-		push	ds
-                mov     ds,ax
-                cmp     [dword 67h*4],eax
-		pop	ds
+                mov     es,ax
+                cmp     [dword es:67h*4],eax
                 je      no_vcpi
                 mov     ah,0DEh		; check for vcpi present
                 int     67h
@@ -251,27 +247,27 @@
 		pushfd
 		pop	dx
 		pop	dx
-		xor	al,dl		; clear C
+		xor	al,dl		; clear C; 00=P5+=PE+Z 20=486=PO 24=386=PE
 		ifdef	CPUTYPE
 		 ifndef	VCPI
  		  ifdef	LARGE_ZIMAGE
 		cdq			; 386 and 486 are not 64 bits
 		  endif
 		 endif
-		cmp	al,20h
 		mov	ax,0400h
-		je	is486
+		jpo	is486
 		mov	ah,3
 is486:
-		jae	set_cputype
+		jne	set_cputype	; edx[31-20]=0 see [1]; edx.26=lm=0
+		xchg	ax,si		; si=0300h
+basicCPUID:
 		xor	eax,eax
 		inc	ax
 		cpuid			; Basic cpuid (late 486 or Pentium)
-		xor	eax,eax
-		inc	ax
-		cpuid			; again cause of Nasty EMM386s
+		inc	si
+		jpo	basicCPUID	; again cause of Nasty EMM386s	
 		push	eax
-		shr	edx,1+26	; test bit 26 (sse2), clear bit 29 (tm/lm confusion)
+		shr	edx,1+26	; test bit 26 (sse2), clear bit 29 (avoid tm/lm confusion)
 		jnc	baseInfo
 		else
 		jne	@@no_cpuid	; CPUID feature bit changed ?
@@ -280,21 +276,21 @@
 		cpuid			; Extended cpuid (Pentium 4)
 		ifdef	CPUTYPE
 baseInfo:
-		pop	ax		; base IDs
-		and	ax,0FF0h	; keep FamilyID & ModelID
-		pop	cx		; extended IDs
-		mov	bx,cx
-		shr	bx,4		; extended FamilyID in bl
-		shr	al,4		; set base ModelID
-		cmp	ah,0Fh
+		pop	ax		; base FamilyID[11-8] & base ModelID[7-4]
+		pop	bx		; extended FamilyID[11-4] & extended ModelID[3-0]
+		mov	cx,0F04h
+		and	ah,ch
+		and	bh,ch
+		ror	bx,cl		; extended FamilyID in bl, extended ModelID in bh[7-4]
+		shr	al,cl		; set base ModelID
+		cmp	ah,ch
 		jz	SetModelID
 		cmp	ah,06h
 		jnz	ModelIDset
-		db	3Dh		; cmp ax,0DC00h
+		db	3Dh		; cmp ax,0E302h
 SetModelID:
 		add	ah,bl		; use extended FamilyID
-		shl	cl,4
-		or	al,cl		; use extended ModelID
+		or	al,bh		; use extended ModelID
 ModelIDset:
 set_cputype:
 		endif
diff -r 072e91636362 -r dbc597fbeee5 ventoy/receipt
--- a/ventoy/receipt	Sat Dec 11 19:18:13 2021 +0000
+++ b/ventoy/receipt	Mon Dec 20 10:05:11 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="ventoy"
-VERSION="1.0.61"
+VERSION="1.0.62"
 CATEGORY="misc"
 SHORT_DESC="A tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,7 +12,7 @@
 EXTRA_SOURCE_FILES="$PACKAGE-bin-$VERSION.tar.gz"
 HOST_ARCH="i486"
 
-DEPENDS="slitaz-tools"
+DEPENDS="slitaz-tools exfat-utils"
 SUGGESTED="tazweb"
 
 current_version()
@@ -24,8 +24,10 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	sed -i 's|^build_func |#&|;s|#\(build_func .*i386\)|\1|;s|-l pthread|& -l rt|' LinuxGUI/build.sh
+	sed -i 's|^build_func |#&|;s|#\(build_func .*i386\)|\1|;s|-l pthread|& -l rt|' \
+		LinuxGUI/build.sh Plugson/build.sh
 	cd LinuxGUI && sh build.sh
+	cd ../Plugson && sh build.sh
 	[ -s $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES ] ||
 		wget --no-check-certificate -O $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES \
 		"https://github.com/ventoy/Ventoy/releases/download/v$VERSION/ventoy-$VERSION-linux.tar.gz"
@@ -47,9 +49,16 @@
 	rm -rf $fs/usr/share/ventoy/tool/x86_64 
 	ln -s i386 $fs/usr/share/ventoy/tool/x86_64
 	rm -rf $fs/usr/share/ventoy/tool/mips64el
+	sed 's|uname -m|echo i386|' -i $fs/usr/share/ventoy/*.sh
 	sed '/= VentoyWeb.sh =/,/just execute/d' -i $fs/usr/share/ventoy/README
 	cp $src/INSTALL/tool/i386/V2DServer $fs/usr/share/ventoy/tool/i386/
 	chmod +x $fs/usr/share/ventoy/tool/i386/V2DServer
-	cp $stuff/TazVentoy.sh $fs/usr/share/ventoy/
+	cp $src/INSTALL/tool/i386/Plugson $fs/usr/share/ventoy/tool/i386/
+	chmod +x $fs/usr/share/ventoy/tool/i386/Plugson
+	unxz $fs/usr/share/ventoy/tool/i386/vtoycli.xz
+	chmod +x $fs/usr/share/ventoy/tool/i386/vtoycli
+	rm -f $fs/usr/share/ventoy/tool/i386/*xz*
+	cp $stuff/TazVentoy*.sh $fs/usr/share/ventoy/
 	ln -s /tmp/ventoy.log $fs/usr/share/ventoy/log.txt
+	ln -s /tmp/ventoyPlugson.log $fs/usr/share/ventoy/VentoyPlugson.log
 }
diff -r 072e91636362 -r dbc597fbeee5 ventoy/stuff/TazVentoyPlugson.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ventoy/stuff/TazVentoyPlugson.sh	Mon Dec 20 10:05:11 2021 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+case "$1" in
+-*) echo "Usage: $0 [device] [ip] [port]" && exit 1
+esac
+
+[ $(id -u) -ne 0 ] && exec tazbox su $0 $@
+
+cd $(dirname $0)
+dev="${1:-$(blkid | sed '/Ventoy/!d;s|:.*||;q')}"
+DISK=${dev%[0-9]*}; DISK=${DISK%p}
+HOST="${2:-127.0.0.1}:${3:-24681}"
+fstype="$(blkid $dev | sed 's|.*TYPE="||;s|".*||')"
+mkdir /tmp/mnt$$
+mount ${dev/1/2} /tmp/mnt$$
+version="$(sed '/VERSION=/!d;s|.*="||;s|"||' /tmp/mnt$$/grub/grub.cfg)"
+[ -e /EFI/BOOT/grubx64_real.efi ] && secureboot=1 || secureboot=0
+umount /tmp/mnt$$
+blkid $DISK | grep -q 'PTTYPE="gpt"' && partstyle=1 || partstyle=0
+echo PATH=$(dirname $0)/tool/i386:$PATH Plugson ${HOST/:/ } $(dirname $0) "$DISK" $version "$fstype" $partstyle $secureboot > VentoyPlugson.log
+mount $dev /tmp/mnt$$
+cd /tmp/mnt$$
+mkdir ventoy 2> /dev/null || true
+
+PATH=$(dirname $0)/tool/i386:$PATH Plugson ${HOST/:/ } $(dirname $0) "$DISK" $version "$fstype" $partstyle $secureboot &
+sleep 1
+
+tazweb --notoolbar http://$HOST/ || browser http://$HOST/
+kill %1
+while !umount /tmp/mnt$$ 2> /dev/null; do sleep 1; done && rmdir /tmp/mnt$$