# HG changeset patch # User Pascal Bellard # Date 1434560726 -7200 # Node ID 678daaa781122ab06947d5e925245bb5e78ce341 # Parent 23e20acde6ee01d2d541dd59504ae2e918528cd0 syslinux/taziso/floppyset: fix loram case diff -r 23e20acde6ee -r 678daaa78112 syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Tue Jun 16 22:42:29 2015 +0300 +++ b/syslinux/stuff/iso2exe/taziso Wed Jun 17 19:05:26 2015 +0200 @@ -1125,7 +1125,6 @@ len= if [ "$INITRD" ]; then l=0 - tot=0 for i in ${INITRD//,/ }; do [ -e /media/cdrom/$i ] || i=$(locase $i) ddq if=/media/cdrom/$i >> /tmp/fd$$ @@ -1135,14 +1134,12 @@ ddq if=/dev/zero bs=1 count=$r >> /tmp/fd$$ l=$(($l + $r)) fi - [ "$i" == "rootfs.gz" ] && case "$INITRD" in - rootfs.gz,rootfs*) continue # loram + case "$i:$INITRD" in + *rootfs.gz:*rootfs.gz,*) continue # loram esac len="$len $l"; l=0 - tot=$(($tot+$l)) done - page=4096 - rdadrs=$(((($syssize*16)+0x1F0000) & -$page)) + rdadrs=${RDADRS:-$(((($syssize*16)+0x1F0000) & -4096))} words2bin $(($rdadrs & 0xFFFF)) $(($rdadrs >> 16)) | ddq \ conv=notrunc bs=1 seek=536 count=4 of=/tmp/fd$$ fi