wok rev 23970

Up tazlito (528)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Oct 04 13:29:03 2020 +0000 (2 weeks ago)
parents 286a59d18f59
children ee961aa986c8
files syslinux/stuff/iso2exe/taziso tazlito/receipt
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Sun Oct 04 07:34:51 2020 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Oct 04 13:29:03 2020 +0000
     1.3 @@ -919,6 +919,7 @@
     1.4  {
     1.5  	gotcdfile "$1" &&
     1.6  	[ $(get 0 $file 2>/dev/null || echo 0) -eq 23117 ] &&
     1.7 +	[ $(get 128 $file 2>/dev/null || echo 0) -ne 10 ] &&
     1.8  	menuitem "$@"
     1.9  }
    1.10  
    1.11 @@ -1009,6 +1010,12 @@
    1.12  	[ $(get 18 "$ISO") -ne 0 ] && menuitem "$@"
    1.13  }
    1.14  
    1.15 +read_return()
    1.16 +{
    1.17 +	echo -e "\rPress RETURN to continue."
    1.18 +	read n
    1.19 +}
    1.20 +
    1.21  getcustomconf()
    1.22  {
    1.23  	ddq bs=2k skip=$(customsector) if="$ISO" | while read line; do
    1.24 @@ -1023,17 +1030,15 @@
    1.25  		*)	  break ;;
    1.26  		esac
    1.27  	done
    1.28 -	[ "$1" ] && return 0
    1.29 -	echo -e "\rPress RETURN to continue."
    1.30 -	read n
    1.31 +	[ "$1" ] || read_return
    1.32  }
    1.33  
    1.34  setcustomconf()
    1.35  {
    1.36 +	msg="$(stat -c '%12s   %.16z   %n' $PWD/cmdline $PWD/initrd 2>/dev/null|sed 'N;s|\n|\\n|')"
    1.37 +	[ "$msg" ] || msg="These files are not found. Your configuration will be cleared.\\n"
    1.38  	msg="\nUpdate the custom configuration with the files cmdline and initrd\n
    1.39 -in the current directory $PWD. Any missing file is assumed empty.\n\n
    1.40 -$(ls -l $PWD/cmdline $PWD/initrd 2> /dev/null| sed 's|.\{1,30\}||' | \
    1.41 -sed 'N;s|\n|\\n|')"
    1.42 +in the current directory $PWD. Any missing file is assumed empty.\n\n$msg"
    1.43  	[ "$1" ] && echo -e "$msg" ||
    1.44  	$DIALOG --clear --title " Update custom configuration " \
    1.45  		--yes-label "Update config" --yesno "$msg\n
    1.46 @@ -1045,10 +1050,11 @@
    1.47  		[ -s $PWD/cmdline ] &&
    1.48  		echo "append=$(cat $PWD/cmdline)" >>/tmp/custom$$
    1.49  		[ -s $PWD/initrd ] &&
    1.50 -		echo "initrd:$(stat -c %s $PWD/initrd)" >>/tmp/custom$$ &&
    1.51 +		echo "initrd:$(size $PWD/initrd)" >>/tmp/custom$$ &&
    1.52  		cat $PWD/initrd >>/tmp/custom$$
    1.53  		echo "#!boot $(md5sum /tmp/custom$$ | sed 's| .*||')" >>"$ISO"
    1.54  		cat /tmp/custom$$ >>"$ISO"
    1.55 +		dd if=/dev/zero bs=4k count=1 >>"$ISO"
    1.56  		rm -f /tmp/custom$$
    1.57  	fi
    1.58  }
    1.59 @@ -1086,9 +1092,7 @@
    1.60  		rm -f $TMP
    1.61  	fi
    1.62  	rm -f /tmp/wait
    1.63 -	[ "$1" ] && return 0
    1.64 -	echo -e "\rPress RETURN to continue."
    1.65 -	read n
    1.66 +	[ "$1" ] || read_return
    1.67  }
    1.68  
    1.69  usbdev()
    1.70 @@ -1362,9 +1366,7 @@
    1.71  	tazlito iso2flavor "$ISO" $name
    1.72  	ls -l $name.flavor 2> /dev/null && return
    1.73  	sleep 5
    1.74 -	[ "$1" ] && return
    1.75 -	echo -e "\rPress RETURN to continue."
    1.76 -	read n
    1.77 +	[ "$1" ] || read_return
    1.78  }
    1.79  
    1.80  if [ "$1" = "--build" ]; then	#install-begin
    1.81 @@ -1645,7 +1647,7 @@
    1.82  $(hasflavinfo		"showfavinfo"	"Show flavor extra info") \
    1.83  $(hasflavor		"flavor"	"Get flavor file") \
    1.84  $(cdfile isolinux.cfg	"floppyset"	"Boot floppy set") \
    1.85 -$(cdfile linld.com	"tazboot"	"Get tazboot.exe Linux loader") \
    1.86 +$(cdfile linld.com	"tazboot"	"Get tazboot.exe Linux loader for DOS") \
    1.87  $(cdexe 'bzImage*'	"bzimage"	"Get linux DOS/EXE file") \
    1.88  $(cdexe 'memtest*'	"memtest"	"Get Memtest86 DOS/EXE file") \
    1.89  $(cdfilef 'memtest*'	"fdmemtest"	"Create a Memtest86 boot floppy") \
     2.1 --- a/tazlito/receipt	Sun Oct 04 07:34:51 2020 +0100
     2.2 +++ b/tazlito/receipt	Sun Oct 04 13:29:03 2020 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="tazlito"
     2.7 -VERSION="527"
     2.8 +VERSION="528"
     2.9  CATEGORY="base-system"
    2.10  SHORT_DESC="SliTaz Live Tool."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"