# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1601818143 0
# Node ID b7c7891464b108196140183d19ba032a89629056
# Parent  286a59d18f599a2556788b107399972c4a8ea896
Up tazlito (528)

diff -r 286a59d18f59 -r b7c7891464b1 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sun Oct 04 07:34:51 2020 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Sun Oct 04 13:29:03 2020 +0000
@@ -919,6 +919,7 @@
 {
 	gotcdfile "$1" &&
 	[ $(get 0 $file 2>/dev/null || echo 0) -eq 23117 ] &&
+	[ $(get 128 $file 2>/dev/null || echo 0) -ne 10 ] &&
 	menuitem "$@"
 }
 
@@ -1009,6 +1010,12 @@
 	[ $(get 18 "$ISO") -ne 0 ] && menuitem "$@"
 }
 
+read_return()
+{
+	echo -e "\rPress RETURN to continue."
+	read n
+}
+
 getcustomconf()
 {
 	ddq bs=2k skip=$(customsector) if="$ISO" | while read line; do
@@ -1023,17 +1030,15 @@
 		*)	  break ;;
 		esac
 	done
-	[ "$1" ] && return 0
-	echo -e "\rPress RETURN to continue."
-	read n
+	[ "$1" ] || read_return
 }
 
 setcustomconf()
 {
+	msg="$(stat -c '%12s   %.16z   %n' $PWD/cmdline $PWD/initrd 2>/dev/null|sed 'N;s|\n|\\n|')"
+	[ "$msg" ] || msg="These files are not found. Your configuration will be cleared.\\n"
 	msg="\nUpdate the custom configuration with the files cmdline and initrd\n
-in the current directory $PWD. Any missing file is assumed empty.\n\n
-$(ls -l $PWD/cmdline $PWD/initrd 2> /dev/null| sed 's|.\{1,30\}||' | \
-sed 'N;s|\n|\\n|')"
+in the current directory $PWD. Any missing file is assumed empty.\n\n$msg"
 	[ "$1" ] && echo -e "$msg" ||
 	$DIALOG --clear --title " Update custom configuration " \
 		--yes-label "Update config" --yesno "$msg\n
@@ -1045,10 +1050,11 @@
 		[ -s $PWD/cmdline ] &&
 		echo "append=$(cat $PWD/cmdline)" >>/tmp/custom$$
 		[ -s $PWD/initrd ] &&
-		echo "initrd:$(stat -c %s $PWD/initrd)" >>/tmp/custom$$ &&
+		echo "initrd:$(size $PWD/initrd)" >>/tmp/custom$$ &&
 		cat $PWD/initrd >>/tmp/custom$$
 		echo "#!boot $(md5sum /tmp/custom$$ | sed 's| .*||')" >>"$ISO"
 		cat /tmp/custom$$ >>"$ISO"
+		dd if=/dev/zero bs=4k count=1 >>"$ISO"
 		rm -f /tmp/custom$$
 	fi
 }
@@ -1086,9 +1092,7 @@
 		rm -f $TMP
 	fi
 	rm -f /tmp/wait
-	[ "$1" ] && return 0
-	echo -e "\rPress RETURN to continue."
-	read n
+	[ "$1" ] || read_return
 }
 
 usbdev()
@@ -1362,9 +1366,7 @@
 	tazlito iso2flavor "$ISO" $name
 	ls -l $name.flavor 2> /dev/null && return
 	sleep 5
-	[ "$1" ] && return
-	echo -e "\rPress RETURN to continue."
-	read n
+	[ "$1" ] || read_return
 }
 
 if [ "$1" = "--build" ]; then	#install-begin
@@ -1645,7 +1647,7 @@
 $(hasflavinfo		"showfavinfo"	"Show flavor extra info") \
 $(hasflavor		"flavor"	"Get flavor file") \
 $(cdfile isolinux.cfg	"floppyset"	"Boot floppy set") \
-$(cdfile linld.com	"tazboot"	"Get tazboot.exe Linux loader") \
+$(cdfile linld.com	"tazboot"	"Get tazboot.exe Linux loader for DOS") \
 $(cdexe 'bzImage*'	"bzimage"	"Get linux DOS/EXE file") \
 $(cdexe 'memtest*'	"memtest"	"Get Memtest86 DOS/EXE file") \
 $(cdfilef 'memtest*'	"fdmemtest"	"Create a Memtest86 boot floppy") \
diff -r 286a59d18f59 -r b7c7891464b1 tazlito/receipt
--- a/tazlito/receipt	Sun Oct 04 07:34:51 2020 +0100
+++ b/tazlito/receipt	Sun Oct 04 13:29:03 2020 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazlito"
-VERSION="527"
+VERSION="528"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz Live Tool."
 MAINTAINER="pascal.bellard@slitaz.org"