tazlito rev 344 5.2.2

fix noram.cfg
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat May 31 08:44:32 2014 +0000 (2014-05-31)
parents b652d56968a0
children 0dc8f7d2dfa0
files tazlito
line diff
     1.1 --- a/tazlito	Mon May 19 17:31:52 2014 +0200
     1.2 +++ b/tazlito	Sat May 31 08:44:32 2014 +0000
     1.3 @@ -12,7 +12,7 @@
     1.4  # Authors : Christophe Lincoln <pankso@slitaz.org>
     1.5  #           Pascal Bellard <pascal.bellard@slitaz.org>
     1.6  #
     1.7 -VERSION=5.2
     1.8 +VERSION=5.2.2
     1.9  
    1.10  . /lib/libtaz.sh
    1.11  
    1.12 @@ -686,14 +686,9 @@
    1.13  implicit 0
    1.14  prompt 1
    1.15  timeout 80
    1.16 -F1 help.txt
    1.17 -F2 options.txt
    1.18 -F3 isolinux.msg
    1.19 -F4 display.txt
    1.20 -F5 enhelp.txt
    1.21 -F6 enopts.txt
    1.22 +$(grep '^F[0-9]' $1/isolinux.cfg)
    1.23  
    1.24 -display isolinux.msg
    1.25 +$([ -s $1/isolinux.msg ] && echo display isolinux.msg)
    1.26  say Not enough RAM to boot slitaz. Trying hacker mode...
    1.27  default hacker
    1.28  label hacker
    1.29 @@ -2088,6 +2083,7 @@
    1.30  		if [ -s /etc/tazlito/rootfs.list ]; then
    1.31  			FLAVOR_LIST="$(awk '{ for (i = 2; i <= NF; i+=2) \
    1.32  			  printf("%s ",$i) }' < /etc/tazlito/rootfs.list)"
    1.33 +			[ -s $ROOTCD/boot/isolinux/isolinux.msg ] &&
    1.34  			sed -i "s/ *//;s/)/), flavors $FLAVOR_LIST/" \
    1.35  			  $ROOTCD/boot/isolinux/isolinux.msg 2> /dev/null
    1.36  			[ -f $ROOTCD/boot/isolinux/ifmem.c32 -o \