wok diff syslinux/stuff/iso2exe/taziso @ rev 18672

syslinux/iso2exe: undo custom config too
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Dec 05 12:23:18 2015 +0100 (2015-12-05)
parents 28bf6d31c5b9
children 1e69cfd7f652
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Fri Dec 04 22:20:10 2015 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Sat Dec 05 12:23:18 2015 +0100
     1.3 @@ -864,10 +864,11 @@
     1.4  	fi
     1.5  	n=$(($(get 32848 "$ISO" 4)+16))
     1.6  	if [ "$(ddq bs=2k skip=$n if="$ISO" | ddq bs=1 count=6)" == "#!boot" ]; then
     1.7 -		echo -en "\rChecking iso custum boot..."
     1.8 +		echo -en "\rChecking iso custom config..."
     1.9 +		TMP=/tmp/$(basename $0)$$md5
    1.10  		md5="$(ddq bs=2k skip=$n if="$ISO" | while read line; do
    1.11  			case "$line" in
    1.12 -			\#!boot*) echo ${line#*boot } > /tmp/$0$$md5 ;;
    1.13 +			\#!boot*) echo ${line#*boot } > $TMP ;;
    1.14  			append=*) echo $line ;;
    1.15  			initrd:*) echo $line
    1.16  				  ddq bs=1 count=${line#initrd:}
    1.17 @@ -875,8 +876,8 @@
    1.18  			*)	  break ;;	  
    1.19  			esac
    1.20  		done | md5sum | cut -c1-32)"
    1.21 -		[ "$md5" == "$(cat /tmp/$0$$md5)" ] && echo "OK" || echo "ERROR"
    1.22 -		rm -f /tmp/$0$$md5
    1.23 +		[ "$md5" == "$(cat $TMP)" ] && echo "OK" || echo "ERROR"
    1.24 +		rm -f $TMP
    1.25  	fi
    1.26  	rm -f /tmp/wait
    1.27  	[ "$1" ] && return 0