wok diff syslinux/stuff/iso2exe/iso2exe.sh @ 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 0606c4356e47
children 1e69cfd7f652
line diff
     1.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Fri Dec 04 21:23:22 2015 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Sat Dec 05 12:23:18 2015 +0100
     1.3 @@ -315,6 +315,10 @@
     1.4  		ddq if=/dev/zero bs=1 seek=$n count=$((0x8000 - $n)) of=$1 conv=notrunc ;;
     1.5  	    *)  ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc ;;
     1.6  	    esac
     1.7 +	    start=$(custom_config_sector $1)
     1.8 +	    cnt=$((512 - ($start % 512)))
     1.9 +	    [ $cnt -ne 512 ] &&
    1.10 +	    ddq if=/dev/zero of=$1 bs=2k seek=$start count=$cnt
    1.11  	    exit 0
    1.12  	esac
    1.13  	case "$(get 0 $1)" in
    1.14 @@ -357,20 +361,20 @@
    1.15  		echo -n "Adding custom config... "
    1.16  		DATA=/tmp/$0$$
    1.17  		rm -f $DATA > /dev/null
    1.18 -		isosz=$(stat -c %s $ISO)
    1.19 +		isosz=$(stat -c %s $1)
    1.20  		[ "$append" ] && echo "append=$append" >> $DATA
    1.21  		[ -s "$initrd" ] && echo "initrd:$(stat -c %s $initrd)" >> $DATA &&
    1.22  			cat $initrd >> $DATA
    1.23  		echo "#!boot $(md5sum $DATA | sed 's/ .*//')" | cat - $DATA | \
    1.24 -		ddq bs=2k seek=$(custom_config_sector $ISO) of=$ISO conv=notrunc
    1.25 -		if [ $(stat -c %s $ISO) -gt $isosz ]; then
    1.26 -			echo "$(($isosz - $(stat -c %s $ISO))) extra bytes."
    1.27 +		ddq bs=2k seek=$(custom_config_sector $1) of=$1 conv=notrunc
    1.28 +		if [ $(stat -c %s $1) -gt $isosz ]; then
    1.29 +			echo "$(($isosz - $(stat -c %s $1))) extra bytes."
    1.30  		else
    1.31 -			echo "$(($isosz - 32768 - 2048*$(get 32848 $ISO 4) 
    1.32 +			echo "$(($isosz - 32768 - 2048*$(get 32848 $1 4) 
    1.33  				 - $(stat -c %s $DATA) - 24)) bytes free."
    1.34  		fi
    1.35  		rm -f $DATA > /dev/null
    1.36  	fi
    1.37  }
    1.38  
    1.39 -main $@ <<EOT
    1.40 +main "$@" <<EOT