wok rev 18143

syslinux/taziso/floppyset: fix loram case
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jun 17 19:05:26 2015 +0200 (2015-06-17)
parents 23e20acde6ee
children 6c61376778ea
files syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Tue Jun 16 22:42:29 2015 +0300
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Wed Jun 17 19:05:26 2015 +0200
     1.3 @@ -1125,7 +1125,6 @@
     1.4  	len=
     1.5  	if [ "$INITRD" ]; then
     1.6  		l=0
     1.7 -		tot=0
     1.8  		for i in ${INITRD//,/ }; do
     1.9  			[ -e /media/cdrom/$i ] || i=$(locase $i)
    1.10  			ddq if=/media/cdrom/$i >> /tmp/fd$$
    1.11 @@ -1135,14 +1134,12 @@
    1.12  				ddq if=/dev/zero bs=1 count=$r >> /tmp/fd$$
    1.13  				l=$(($l + $r))
    1.14  			fi
    1.15 -			[ "$i" == "rootfs.gz" ] && case "$INITRD" in
    1.16 -				rootfs.gz,rootfs*) continue	# loram
    1.17 +			case "$i:$INITRD" in
    1.18 +				*rootfs.gz:*rootfs.gz,*) continue	# loram
    1.19  			esac
    1.20  			len="$len $l"; l=0
    1.21 -			tot=$(($tot+$l))
    1.22  		done
    1.23 -		page=4096
    1.24 -		rdadrs=$(((($syssize*16)+0x1F0000) & -$page))
    1.25 +		rdadrs=${RDADRS:-$(((($syssize*16)+0x1F0000) & -4096))}
    1.26  		words2bin $(($rdadrs & 0xFFFF)) $(($rdadrs >> 16)) | ddq \
    1.27  			conv=notrunc bs=1 seek=536 count=4 of=/tmp/fd$$
    1.28  	fi