wok diff syslinux/stuff/iso2exe/init @ rev 17659

syslinux/taziso: kexec do not load zImage
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 15 11:18:31 2015 +0100 (2015-02-15)
parents 65c5ea249c9a
children 639e963885dd
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Sat Feb 14 18:17:26 2015 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/init	Sun Feb 15 11:18:31 2015 +0100
     1.3 @@ -611,9 +611,18 @@
     1.4  	gotcdfile "$1" && echo -en "\"$2\"	\"$3\""
     1.5  }
     1.6  
     1.7 +isbzImage()
     1.8 +{
     1.9 +	[ $(get 514 $file 4) -eq 1400005704 ] &&
    1.10 +	[ $(($(get 529 $file 1) & 1)) -eq 1 ]
    1.11 +}
    1.12 +
    1.13  cdfilex()
    1.14  {
    1.15 -	[ "$(which kexec)" ] && cdfile "$@"
    1.16 +	gotcdfile "$1" &&
    1.17 +	[ "$(which kexec)" ] &&
    1.18 +	isbzImage &&
    1.19 +	echo -en "\"$2\"	\"$3\""
    1.20  }
    1.21  
    1.22  cdfilef()
    1.23 @@ -874,7 +883,7 @@
    1.24  
    1.25  dokexec()
    1.26  {
    1.27 -	kexec -l $file
    1.28 +	kexec -l $file || return
    1.29  	dosync
    1.30  	kexec -e
    1.31  }