SliTaz Repositories

     1.1 --- a/syslinux/stuff/iso2exe/taziso	Thu Jul 14 10:28:07 2016 +0200
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Fri Sep 30 21:29:58 2016 +0200
     1.3 @@ -756,7 +756,8 @@
     1.4  
     1.5  gotposixovl()
     1.6  {
     1.7 -	mount.posixovl 2>&1 | grep -qi usage && menuitem "$@"
     1.8 +	mount.posixovl 2>&1 | grep -qi usage && gotcdfile 'rootfs*.gz' &&
     1.9 +	menuitem "$@"
    1.10  }
    1.11  
    1.12  gotposixovlzip()
    1.13 @@ -774,6 +775,11 @@
    1.14  	gotcdfile "$1" && menuitem "$@"
    1.15  }
    1.16  
    1.17 +gottazusb()
    1.18 +{
    1.19 +	gotcdfile 'rootfs*.gz' && xfile tazusb "$@"
    1.20 +}
    1.21 +
    1.22  isbzImage()
    1.23  {
    1.24  	[ $(get 514 $file 4) -eq 1400005704 ] &&
    1.25 @@ -869,6 +875,11 @@
    1.26  	hascustomconf && menuitem "$@"
    1.27  }
    1.28  
    1.29 +hasflavor()
    1.30 +{
    1.31 +	[ -x /usr/bin/tazlito ] && [ -s $media/boot/bzImage ] && menuitem "$@"
    1.32 +}
    1.33 +
    1.34  gotisomd5()
    1.35  {
    1.36  	[ "$(which md5sum 2> /dev/null)" ] &&
    1.37 @@ -1081,6 +1092,7 @@
    1.38  flavdata()
    1.39  {
    1.40  	[ $(get 1024 "$ISO") -eq 35615 ] && n=2 || n=$((1+$(get 417 "$ISO" 1)))
    1.41 +	[ $n -eq 4 ] && n=20
    1.42  	dd if="$ISO" bs=512 skip=$n count=20 2>/dev/null | zcat 2>/dev/null
    1.43  }
    1.44  
    1.45 @@ -1191,9 +1203,10 @@
    1.46  
    1.47  floppyset()
    1.48  {
    1.49 -	gotcdfile isolinux.cfg
    1.50 +	gotcdfile 'isolinux.cfg'
    1.51  	parse_isolinux < $file > /tmp/var$$
    1.52  	. /tmp/var$$
    1.53 +	[ -z "$KERNEL" ] && echo "Can't parse isolinux.cfg" && return
    1.54  	for i in $media/$KERNEL $(dirname $file)/$KERNEL $media/$(locase $KERNEL) \
    1.55  		 $(dirname $file)/$(locase $KERNEL); do
    1.56  		[ -s $i ] && KERNEL=$i && break
    1.57 @@ -1356,10 +1369,10 @@
    1.58  $(gotposixovl		"installtaz"	"Hard disk installation (TAZUSB way)") \
    1.59  $(gotposixovlzip	"inst2zip"	"ZIP installation archive (UMSDOS way)") \
    1.60  $(gotposixovlzip	"insttaz2zip"	"ZIP installation archive (TAZUSB way)") \
    1.61 -$(xfile tazusb		"usbkey"	"USB key read/write installation") \
    1.62 +$(gottazusb 		"usbkey"	"USB key read/write installation") \
    1.63  $(ishybrid		"usbbootkey"	"USB boot key (read only)") \
    1.64  $(hasflavinfo		"showfavinfo"	"Show flavor extra info") \
    1.65 -$(xfile tazlito		"flavor"	"Get flavor file") \
    1.66 +$(hasflavor		"flavor"	"Get flavor file") \
    1.67  $(cdfile isolinux.cfg	"floppyset"	"Boot floppy set") \
    1.68  $(hastazboot		"tazboot"	"Get tazboot.exe Linux loader") \
    1.69  $(cdexe boot/bzImage	"bzimage"	"Get linux DOS/EXE file") \