tiny-slitaz rev 24

Floppy menu is 512 bytes aligned, not 1024
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Sep 01 18:10:39 2019 +0200 (2019-09-01)
parents 94ba265c1763
children 293348721e35
files helper
line diff
     1.1 --- a/helper	Tue Feb 26 08:33:34 2019 +0100
     1.2 +++ b/helper	Sun Sep 01 18:10:39 2019 +0200
     1.3 @@ -449,24 +449,21 @@
     1.4  	cd $tmp
     1.5  	cp fs/boot/bzImage slitaz.img
     1.6  	sh fs/boot/bundle slitaz.img rootfs.gz
     1.7 -	if [ -s fs/boot/ipxe ] && [ -s fs/boot/memtest ] &&
     1.8 -	   [ $(du -c fs/boot/ipxe fs/boot/memtest slitaz.img | \
     1.9 -			awk 'END { print $1 }') -lt 1440 ]; then
    1.10 +	if [ -s fs/boot/ipxe ] && [ -s fs/boot/memtest ]; then
    1.11  		sh fs/boot/bundle out "   SliTaz boot menu" slitaz.img \
    1.12  			"Tiny SliTaz" fs/boot/ipxe "SliTaz web boot" \
    1.13  			fs/boot/memtest "Check memory"
    1.14 -		mv -f out slitaz.img
    1.15 -	elif [ -s fs/boot/ipxe ] && [ $(du -c fs/boot/ipxe slitaz.img | \
    1.16 -			awk 'END { print $1 }') -lt 1440 ]; then
    1.17 +	elif [ -s fs/boot/ipxe ]; then
    1.18  		sh fs/boot/bundle out "   SliTaz boot menu" slitaz.img \
    1.19  			"Tiny SliTaz" fs/boot/ipxe "SliTaz web boot"
    1.20 -		mv -f out slitaz.img
    1.21 -	elif [ -s fs/boot/memtest ] && [ $(du -c fs/boot/memtest slitaz.img | \
    1.22 -			awk 'END { print $1 }') -lt 1440 ]; then
    1.23 +	elif [ -s fs/boot/memtest ]; then
    1.24  		sh fs/boot/bundle out "   SliTaz boot menu" slitaz.img \
    1.25  			"Tiny SliTaz" fs/boot/memtest "Check memory"
    1.26  		mv -f out slitaz.img
    1.27 +	else
    1.28 +		cp slitaz.img out
    1.29  	fi
    1.30 +	[ $(stat -c %s out) -le 1474560 ] && mv -f out slitaz.img || rm -f out
    1.31  	[ $(stat -c %s slitaz.img) -lt 1474560 ] &&
    1.32  	dd of=slitaz.img bs=18k seek=80 count=0 2> /dev/null
    1.33  fi