wok rev 829

syslinux: fix keyboard, tip in splash screen
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat May 17 21:03:22 2008 +0000 (2008-05-17)
parents 296dbd15f4b2
children 38e7dabd3c3e
files syslinux/receipt syslinux/stuff/be.cfg syslinux/stuff/ca.cfg syslinux/stuff/common.inc syslinux/stuff/de_CH.cfg syslinux/stuff/en.cfg syslinux/stuff/enopts.txt syslinux/stuff/es.cfg syslinux/stuff/fi.cfg syslinux/stuff/fr.cfg syslinux/stuff/fr_CH.cfg syslinux/stuff/hu.cfg syslinux/stuff/isolinux.cfg syslinux/stuff/it.cfg syslinux/stuff/options.txt syslinux/stuff/slitaz.css syslinux/stuff/slitaz.html syslinux/stuff/splash.lss syslinux/stuff/us.cfg
line diff
     1.1 --- a/syslinux/receipt	Sat May 17 21:36:03 2008 +0200
     1.2 +++ b/syslinux/receipt	Sat May 17 21:03:22 2008 +0000
     1.3 @@ -13,20 +13,13 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  compile_rules()
     1.6  {
     1.7 -	cd $src
     1.8 -	sed "s|\\\$DEFAULT_PATH = .*|\$DEFAULT_PATH = \"$PWD\";|" \
     1.9 -		> mkkbd < keytab-lilo.pl
    1.10 -	chmod +x mkkbd
    1.11 -	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do
    1.12 -		[ "$(dirname $i)" = "include" ] && continue
    1.13 -		j=$(basename $i)
    1.14 -		zcat /usr/share/kbd/keymaps/i386/$i > ${j%.gz}
    1.15 -	done
    1.16 -	for i in $(ls *.map); do
    1.17 -		i=$(basename $i)
    1.18 -		i=${i%.map}
    1.19 -		./mkkbd $i > $i.kbd
    1.20 -	done
    1.21 +    cd $src
    1.22 +    for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
    1.23 +        [ "$(basename $(dirname $i))" = "include" ] && continue
    1.24 +        j=$(basename $i)
    1.25 +        j=${j%.map.gz}.kbd
    1.26 +        ./keytab-lilo.pl /usr/share/kbd/keymaps/i386/qwerty/us.map.gz $i > $j
    1.27 +    done
    1.28  }
    1.29  
    1.30  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.31 @@ -37,8 +30,10 @@
    1.32      cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
    1.33      cp stuff/* $fs/boot/isolinux
    1.34      rm -r $fs/boot/isolinux/slitaz.* $fs/boot/isolinux/*.kbd 2> /dev/null
    1.35 -    for i in $(grep kbd$ $fs/boot/isolinux/*.cfg | cut -d' ' -f2); do
    1.36 -        cp $src/$i $fs/boot/isolinux
    1.37 +    grep kbd$ $fs/boot/isolinux/*.cfg | while read cfg kbd; do
    1.38 +        cfg=$(basename ${cfg%.cfg:*})
    1.39 +	sed -i "s/$kbd/$cfg.kbd/" $fs/boot/isolinux/$cfg.cfg
    1.40 +        cp $src/$kbd $fs/boot/isolinux/$cfg.kbd
    1.41      done
    1.42      chown root.root $fs/boot/isolinux/*
    1.43  }
     2.1 --- a/syslinux/stuff/be.cfg	Sat May 17 21:36:03 2008 +0200
     2.2 +++ b/syslinux/stuff/be.cfg	Sat May 17 21:03:22 2008 +0000
     2.3 @@ -1,39 +1,6 @@
     2.4 -display isolinux.msg
     2.5  KBDMAP be-latin1.kbd
     2.6 -default slitaz
     2.7  label slitaz
     2.8  	kernel /boot/bzImage
     2.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=be-latin1
    2.10  
    2.11 -label ca
    2.12 -	config ca.cfg
    2.13 -label ch
    2.14 -	config fr_CH.cfg
    2.15 -label de
    2.16 -	config de_CH.cfg
    2.17 -label def
    2.18 -	config isolinux.cfg
    2.19 -label en
    2.20 -	config en.cfg
    2.21 -label es
    2.22 -	config es.cfg
    2.23 -label fr
    2.24 -	config fr.cfg
    2.25 -label it
    2.26 -	config it.cfg
    2.27 -label reboot
    2.28 -	com32 reboot.c32
    2.29 -label uk
    2.30 -	config en.cfg
    2.31 -label us
    2.32 -	config us.cfg
    2.33 -
    2.34 -implicit 0	
    2.35 -prompt 1	
    2.36 -timeout 80
    2.37 -F1 help.txt
    2.38 -F2 options.txt
    2.39 -F3 isolinux.msg
    2.40 -F4 display.txt
    2.41 -F5 enhelp.txt
    2.42 -F6 enopts.txt
    2.43 +include common.inc
     3.1 --- a/syslinux/stuff/ca.cfg	Sat May 17 21:36:03 2008 +0200
     3.2 +++ b/syslinux/stuff/ca.cfg	Sat May 17 21:03:22 2008 +0000
     3.3 @@ -1,39 +1,6 @@
     3.4 -display isolinux.msg
     3.5  KBDMAP cf.kbd
     3.6 -default slitaz
     3.7  label slitaz
     3.8  	kernel /boot/bzImage
     3.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=cf
    3.10  
    3.11 -label be
    3.12 -	config be.cfg
    3.13 -label ch
    3.14 -	config fr_CH.cfg
    3.15 -label de
    3.16 -	config de_CH.cfg
    3.17 -label def
    3.18 -	config isolinux.cfg
    3.19 -label en
    3.20 -	config en.cfg
    3.21 -label es
    3.22 -	config es.cfg
    3.23 -label fr
    3.24 -	config fr.cfg
    3.25 -label it
    3.26 -	config it.cfg
    3.27 -label reboot
    3.28 -	com32 reboot.c32
    3.29 -label uk
    3.30 -	config en.cfg
    3.31 -label us
    3.32 -	config us.cfg
    3.33 -	
    3.34 -implicit 0	
    3.35 -prompt 1	
    3.36 -timeout 80
    3.37 -F1 help.txt
    3.38 -F2 options.txt
    3.39 -F3 isolinux.msg
    3.40 -F4 display.txt
    3.41 -F5 enhelp.txt
    3.42 -F6 enopts.txt
    3.43 +include common.inc
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/syslinux/stuff/common.inc	Sat May 17 21:03:22 2008 +0000
     4.3 @@ -0,0 +1,38 @@
     4.4 +display isolinux.msg
     4.5 +default slitaz
     4.6 +label be
     4.7 +	config be.cfg
     4.8 +label ca
     4.9 +	config ca.cfg
    4.10 +label ch
    4.11 +	config fr_CH.cfg
    4.12 +label de
    4.13 +	config de_CH.cfg
    4.14 +label en
    4.15 +	config en.cfg
    4.16 +label es
    4.17 +	config es.cfg
    4.18 +label fi
    4.19 +	config fi.cfg
    4.20 +label fr
    4.21 +	config fr.cfg
    4.22 +label hu
    4.23 +	config hu.cfg
    4.24 +label it
    4.25 +	config it.cfg
    4.26 +label reboot
    4.27 +	com32 reboot.c32
    4.28 +label uk
    4.29 +	config en.cfg
    4.30 +label us
    4.31 +	config us.cfg
    4.32 +
    4.33 +implicit 0	
    4.34 +prompt 1	
    4.35 +timeout 80
    4.36 +F1 help.txt
    4.37 +F2 options.txt
    4.38 +F3 isolinux.msg
    4.39 +F4 display.txt
    4.40 +F5 enhelp.txt
    4.41 +F6 enopts.txt
     5.1 --- a/syslinux/stuff/de_CH.cfg	Sat May 17 21:36:03 2008 +0200
     5.2 +++ b/syslinux/stuff/de_CH.cfg	Sat May 17 21:03:22 2008 +0000
     5.3 @@ -1,39 +1,6 @@
     5.4 -display isolinux.msg
     5.5  KBDMAP de_CH-latin1.kbd
     5.6 -default slitaz
     5.7  label slitaz
     5.8  	kernel /boot/bzImage
     5.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=de_DE kmap=de_CH-latin1
    5.10  
    5.11 -label be
    5.12 -	config be.cfg
    5.13 -label ca
    5.14 -	config ca.cfg
    5.15 -label ch
    5.16 -	config fr_CH.cfg
    5.17 -label def
    5.18 -	config isolinux.cfg
    5.19 -label en
    5.20 -	config en.cfg
    5.21 -label es
    5.22 -	config es.cfg
    5.23 -label fr
    5.24 -	config fr.cfg
    5.25 -label it
    5.26 -	config it.cfg
    5.27 -label reboot
    5.28 -	com32 reboot.c32
    5.29 -label uk
    5.30 -	config en.cfg
    5.31 -label us
    5.32 -	config us.cfg
    5.33 -
    5.34 -implicit 0	
    5.35 -prompt 1	
    5.36 -timeout 80
    5.37 -F1 help.txt
    5.38 -F2 options.txt
    5.39 -F3 isolinux.msg
    5.40 -F4 display.txt
    5.41 -F5 enhelp.txt
    5.42 -F6 enopts.txt
    5.43 +include common.inc
     6.1 --- a/syslinux/stuff/en.cfg	Sat May 17 21:36:03 2008 +0200
     6.2 +++ b/syslinux/stuff/en.cfg	Sat May 17 21:03:22 2008 +0000
     6.3 @@ -1,37 +1,6 @@
     6.4 -display isolinux.msg
     6.5  KBDMAP uk.kbd
     6.6 -default slitaz
     6.7  label slitaz
     6.8  	kernel /boot/bzImage
     6.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=C kmap=uk
    6.10  
    6.11 -label be
    6.12 -	config be.cfg
    6.13 -label ca
    6.14 -	config ca.cfg
    6.15 -label ch
    6.16 -	config fr_CH.cfg
    6.17 -label de
    6.18 -	config de_CH.cfg
    6.19 -label def
    6.20 -	config isolinux.cfg
    6.21 -label es
    6.22 -	config es.cfg
    6.23 -label fr
    6.24 -	config fr.cfg
    6.25 -label it
    6.26 -	config it.cfg
    6.27 -label reboot
    6.28 -	com32 reboot.c32
    6.29 -label us
    6.30 -	config us.cfg
    6.31 -
    6.32 -implicit 0	
    6.33 -prompt 1	
    6.34 -timeout 80
    6.35 -F1 help.txt
    6.36 -F2 options.txt
    6.37 -F3 isolinux.msg
    6.38 -F4 display.txt
    6.39 -F5 enhelp.txt
    6.40 -F6 enopts.txt
    6.41 +include common.inc
     7.1 --- a/syslinux/stuff/enopts.txt	Sat May 17 21:36:03 2008 +0200
     7.2 +++ b/syslinux/stuff/enopts.txt	Sat May 17 21:03:22 2008 +0000
     7.3 @@ -15,7 +15,7 @@
     7.4                   Example : config=/dev/hda1,slitaz.sh
     7.5   modprobe=<module_list> : Force module(s) to load.
     7.6   lang=* :        Select language [en,fr_CH,fr_FR]
     7.7 - kmap=* :        Select keyboard [be,ca,de,en,es,fr,fr_CH,it,jp,us]
     7.8 + kmap=* :        Select keyboard [be,ca,de,en,es,fi,fr,fr_CH,hu,it,jp,us]
     7.9   sound=no :      Remove all sound kernel modules.
    7.10   sound=noconf :  Do not configure sound card.
    7.11   screen=<type> : Define screen type [text, 640x480x16..1920x1440x24]
     8.1 --- a/syslinux/stuff/es.cfg	Sat May 17 21:36:03 2008 +0200
     8.2 +++ b/syslinux/stuff/es.cfg	Sat May 17 21:03:22 2008 +0000
     8.3 @@ -1,39 +1,6 @@
     8.4 -display isolinux.msg
     8.5  KBDMAP es.kbd
     8.6 -default slitaz
     8.7  label slitaz
     8.8  	kernel /boot/bzImage
     8.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=es_ES kmap=es
    8.10  
    8.11 -label be
    8.12 -	config be.cfg
    8.13 -label ca
    8.14 -	config ca.cfg
    8.15 -label ch
    8.16 -	config fr_CH.cfg
    8.17 -label de
    8.18 -	config de_CH.cfg
    8.19 -label def
    8.20 -	config isolinux.cfg
    8.21 -label en
    8.22 -	config en.cfg
    8.23 -label fr
    8.24 -	config fr.cfg
    8.25 -label it
    8.26 -	config it.cfg
    8.27 -label reboot
    8.28 -	com32 reboot.c32
    8.29 -label uk
    8.30 -	config en.cfg
    8.31 -label us
    8.32 -	config us.cfg
    8.33 -
    8.34 -implicit 0	
    8.35 -prompt 1	
    8.36 -timeout 80
    8.37 -F1 help.txt
    8.38 -F2 options.txt
    8.39 -F3 isolinux.msg
    8.40 -F4 display.txt
    8.41 -F5 enhelp.txt
    8.42 -F6 enopts.txt
    8.43 +include common.inc
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/syslinux/stuff/fi.cfg	Sat May 17 21:03:22 2008 +0000
     9.3 @@ -0,0 +1,6 @@
     9.4 +KBDMAP fi-latin1.kbd
     9.5 +label slitaz
     9.6 +	kernel /boot/bzImage
     9.7 +	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fi kmap=fi-latin1
     9.8 +
     9.9 +include common.inc
    10.1 --- a/syslinux/stuff/fr.cfg	Sat May 17 21:36:03 2008 +0200
    10.2 +++ b/syslinux/stuff/fr.cfg	Sat May 17 21:03:22 2008 +0000
    10.3 @@ -1,39 +1,6 @@
    10.4 -display isolinux.msg
    10.5  KBDMAP fr-latin1.kbd
    10.6 -default slitaz
    10.7  label slitaz
    10.8  	kernel /boot/bzImage
    10.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=fr-latin1
   10.10  
   10.11 -label be
   10.12 -	config be.cfg
   10.13 -label ca
   10.14 -	config ca.cfg
   10.15 -label ch
   10.16 -	config fr_CH.cfg
   10.17 -label de
   10.18 -	config de_CH.cfg
   10.19 -label def
   10.20 -	config isolinux.cfg
   10.21 -label en
   10.22 -	config en.cfg
   10.23 -label es
   10.24 -	config es.cfg
   10.25 -label it
   10.26 -	config it.cfg
   10.27 -label reboot
   10.28 -	com32 reboot.c32
   10.29 -label uk
   10.30 -	config en.cfg
   10.31 -label us
   10.32 -	config us.cfg
   10.33 -
   10.34 -implicit 0	
   10.35 -prompt 1	
   10.36 -timeout 80
   10.37 -F1 help.txt
   10.38 -F2 options.txt
   10.39 -F3 isolinux.msg
   10.40 -F4 display.txt
   10.41 -F5 enhelp.txt
   10.42 -F6 enopts.txt
   10.43 +include common.inc
    11.1 --- a/syslinux/stuff/fr_CH.cfg	Sat May 17 21:36:03 2008 +0200
    11.2 +++ b/syslinux/stuff/fr_CH.cfg	Sat May 17 21:03:22 2008 +0000
    11.3 @@ -1,39 +1,6 @@
    11.4 -display isolinux.msg
    11.5  KBDMAP fr_CH-latin1.kbd
    11.6 -default slitaz
    11.7  label slitaz
    11.8  	kernel /boot/bzImage
    11.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=fr_CH-latin1
   11.10  
   11.11 -label be
   11.12 -	config be.cfg
   11.13 -label ca
   11.14 -	config ca.cfg
   11.15 -label de
   11.16 -	config de_CH.cfg
   11.17 -label def
   11.18 -	config isolinux.cfg
   11.19 -label fr
   11.20 -	config fr.cfg
   11.21 -label en
   11.22 -	config en.cfg
   11.23 -label es
   11.24 -	config es.cfg
   11.25 -label it
   11.26 -	config it.cfg
   11.27 -label reboot
   11.28 -	com32 reboot.c32
   11.29 -label uk
   11.30 -	config en.cfg
   11.31 -label us
   11.32 -	config us.cfg
   11.33 -
   11.34 -implicit 0	
   11.35 -prompt 1	
   11.36 -timeout 80
   11.37 -F1 help.txt
   11.38 -F2 options.txt
   11.39 -F3 isolinux.msg
   11.40 -F4 display.txt
   11.41 -F5 enhelp.txt
   11.42 -F6 enopts.txt
   11.43 +include common.inc
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/syslinux/stuff/hu.cfg	Sat May 17 21:03:22 2008 +0000
    12.3 @@ -0,0 +1,6 @@
    12.4 +KBDMAP hu.kbd
    12.5 +label slitaz
    12.6 +	kernel /boot/bzImage
    12.7 +	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=hu kmap=hu
    12.8 +
    12.9 +include common.inc
    13.1 --- a/syslinux/stuff/isolinux.cfg	Sat May 17 21:36:03 2008 +0200
    13.2 +++ b/syslinux/stuff/isolinux.cfg	Sat May 17 21:03:22 2008 +0000
    13.3 @@ -1,38 +1,5 @@
    13.4 -display isolinux.msg
    13.5 -default slitaz
    13.6  label slitaz
    13.7  	kernel /boot/bzImage
    13.8  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal
    13.9  
   13.10 -label be
   13.11 -	config be.cfg
   13.12 -label ca
   13.13 -	config ca.cfg
   13.14 -label ch
   13.15 -	config fr_CH.cfg
   13.16 -label de
   13.17 -	config de_CH.cfg
   13.18 -label en
   13.19 -	config en.cfg
   13.20 -label es
   13.21 -	config es.cfg
   13.22 -label fr
   13.23 -	config fr.cfg
   13.24 -label it
   13.25 -	config it.cfg
   13.26 -label reboot
   13.27 -	com32 reboot.c32
   13.28 -label uk
   13.29 -	config en.cfg
   13.30 -label us
   13.31 -	config us.cfg
   13.32 -
   13.33 -implicit 0	
   13.34 -prompt 1	
   13.35 -timeout 80
   13.36 -F1 help.txt
   13.37 -F2 options.txt
   13.38 -F3 isolinux.msg
   13.39 -F4 display.txt
   13.40 -F5 enhelp.txt
   13.41 -F6 enopts.txt
   13.42 +include common.inc
    14.1 --- a/syslinux/stuff/it.cfg	Sat May 17 21:36:03 2008 +0200
    14.2 +++ b/syslinux/stuff/it.cfg	Sat May 17 21:03:22 2008 +0000
    14.3 @@ -1,39 +1,6 @@
    14.4 -display isolinux.msg
    14.5  KBDMAP it.kbd
    14.6 -default slitaz
    14.7  label slitaz
    14.8  	kernel /boot/bzImage
    14.9  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=it_IT kmap=it
   14.10  
   14.11 -label be
   14.12 -	config be.cfg
   14.13 -label ca
   14.14 -	config ca.cfg
   14.15 -label ch
   14.16 -	config fr_CH.cfg
   14.17 -label de
   14.18 -	config de_CH.cfg
   14.19 -label def
   14.20 -	config isolinux.cfg
   14.21 -label en
   14.22 -	config en.cfg
   14.23 -label es
   14.24 -	config es.cfg
   14.25 -label fr
   14.26 -	config fr.cfg
   14.27 -label reboot
   14.28 -	com32 reboot.c32
   14.29 -label uk
   14.30 -	config en.cfg
   14.31 -label us
   14.32 -	config us.cfg
   14.33 -
   14.34 -implicit 0	
   14.35 -prompt 1	
   14.36 -timeout 80
   14.37 -F1 help.txt
   14.38 -F2 options.txt
   14.39 -F3 isolinux.msg
   14.40 -F4 display.txt
   14.41 -F5 enhelp.txt
   14.42 -F6 enopts.txt
   14.43 +include common.inc
    15.1 --- a/syslinux/stuff/options.txt	Sat May 17 21:36:03 2008 +0200
    15.2 +++ b/syslinux/stuff/options.txt	Sat May 17 21:03:22 2008 +0000
    15.3 @@ -15,7 +15,7 @@
    15.4                   peripherique. Exemple : config=/dev/hda1,slitaz.sh
    15.5   modprobe=<module_list> : Force le chargement de module(s).
    15.6   lang=* :        Specifie la langue [en,fr_CH,fr_FR]
    15.7 - kmap=* :        Specifie le clavier [be,ca,de,en,es,fr,fr_CH,it,jp,us]
    15.8 + kmap=* :        Specifie le clavier [be,ca,de,en,es,fi,fr,fr_CH,hu,it,jp,us]
    15.9   sound=no :      Supprime tous les modules son du noyau.
   15.10   sound=noconf :  Ne configure pas la carte son.
   15.11   screen=<type> : Definit le type d'ecran [text,640x480x16..1920x1440x24]
    16.1 --- a/syslinux/stuff/slitaz.css	Sat May 17 21:36:03 2008 +0200
    16.2 +++ b/syslinux/stuff/slitaz.css	Sat May 17 21:03:22 2008 +0000
    16.3 @@ -118,6 +118,10 @@
    16.4  	display: block;
    16.5  }
    16.6  
    16.7 +#nav i {
    16.8 +	color: #DF8F06;
    16.9 +}
   16.10 +
   16.11  /* Page content */
   16.12  
   16.13  #content, #content_bottom, #content_top {
   16.14 @@ -231,13 +235,13 @@
   16.15  	color: #3E1220;
   16.16  	background: inherit;
   16.17  	text-align: left;
   16.18 -	margin: 0px 0px 16px -58px;
   16.19 +	margin: 0px 0px 8px -58px;
   16.20  }
   16.21  
   16.22  h2 {
   16.23      color: #DF8F06;
   16.24      border-left: 10px solid #F3F3F3;
   16.25 -    padding: 4px 0px 4px 4px;
   16.26 +    padding: 0px 0px 0px 4px;
   16.27      margin: 0;
   16.28  }
   16.29  
    17.1 --- a/syslinux/stuff/slitaz.html	Sat May 17 21:36:03 2008 +0200
    17.2 +++ b/syslinux/stuff/slitaz.html	Sat May 17 21:03:22 2008 +0000
    17.3 @@ -22,7 +22,7 @@
    17.4  <div id="header">
    17.5      <a name="top"></a>
    17.6  <!-- Access -->
    17.7 -    <a href="javascript:void(0);" onClick="window.open('slitaz.html','popup','width=640,height=350')"><img id="logo"
    17.8 +    <a href="javascript:void(0);" onClick="window.open('slitaz.html','popup','width=640,height=370')"><img id="logo"
    17.9      src="http://www.slitaz.org/pics/website/logo.png" title="www.slitaz.org" alt="www.slitaz.org"
   17.10      style="border: 0px solid ; width: 200px; height: 74px;" /></a>
   17.11      <p id="titre">#!/LiveCD/boot</p>
   17.12 @@ -32,11 +32,13 @@
   17.13  <div id="nav">
   17.14  <div id="nav_top"></div>
   17.15  <p>
   17.16 -<u>Welcome</u>
   17.17 +Hit <i>ENTER</i> to start or<br>
   17.18 +<i>F5</i> for help 
   17.19  </p>
   17.20  <p>
   17.21 -Hit <i>ENTER</i> to start or<br>
   17.22 -<i>F5</i> for help 
   17.23 +You may select your keyboard with <i>be</i>, <i>ca</i>, <i>de</i>,
   17.24 +<i>en</i>, <i>es</i>, <i>fi</i>, <i>fr</i>, <i>fr_CH</i>, <i>hu</i>,
   17.25 +<i>it</i>, <i>jp</i> or <i>us</i>.
   17.26  </p>
   17.27  <p>
   17.28  Login: <i>hacker</i> or <i>root</i>, password <i>root</i> 
   17.29 @@ -56,16 +58,22 @@
   17.30  <div id="content">
   17.31  <a name="content"></a>
   17.32  
   17.33 -<h1><font color="#3E1220">Bienvenue</font></h1>
   17.34 +<h1><font color="black">Bienvenue - Welcome !</font></h1>
   17.35  <h2><font color="#DF8F06">Comment démarrer ?</font></h2>
   17.36  
   17.37  <p>
   17.38  <b>ENTER</b> pour booter, <b>F1</b> pour afficher la page d'aide.
   17.39 +<br>
   17.40 +[login] <b><i>hacker</i></b> ou <b><i>root</i></b> avec le mot de
   17.41 +passe <b><i>root</i></b>.
   17.42  </p>
   17.43  
   17.44 +<h2><font color="#DF8F06">Exemple, clavier français :</font></h2>
   17.45 +
   17.46  <p>
   17.47 -[login] <b><i>hacker</i></b> ou <b><i>root</i></b> avec le mot de
   17.48 -passe <b><i>root</i></b>.
   17.49 + boot: <b>fr &lt;ENTER&gt;</b>
   17.50 +<br>
   17.51 + boot: <b>&lt;ENTER&gt;</b>
   17.52  </p>
   17.53  
   17.54  </div>
   17.55 @@ -78,11 +86,10 @@
   17.56  </div>
   17.57  
   17.58  <!-- Start of footer and copy notice -->
   17.59 -<div id="copy">
   17.60 +<div id="copy" color="white">
   17.61  <p>
   17.62  SliTaz GNU/linux - Simple Light Incredible Temporary Autonomous Zone
   17.63 -</p>
   17.64 -<p>
   17.65 +<br>
   17.66  Copyright &copy; 2008 SliTaz - http://www.slitaz.org/
   17.67  </p>
   17.68  <!-- End of copy -->
    18.1 Binary file syslinux/stuff/splash.lss has changed
    19.1 --- a/syslinux/stuff/us.cfg	Sat May 17 21:36:03 2008 +0200
    19.2 +++ b/syslinux/stuff/us.cfg	Sat May 17 21:03:22 2008 +0000
    19.3 @@ -1,36 +1,5 @@
    19.4 -display isolinux.msg
    19.5  default slitaz
    19.6 -label slitaz
    19.7  	kernel /boot/bzImage
    19.8  	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=C kmap=us
    19.9  
   19.10 -label be
   19.11 -	config be.cfg
   19.12 -label ca
   19.13 -	config ca.cfg
   19.14 -label ch
   19.15 -	config fr_CH.cfg
   19.16 -label de
   19.17 -	config de_CH.cfg
   19.18 -label en
   19.19 -	config en.cfg
   19.20 -label es
   19.21 -	config es.cfg
   19.22 -label fr
   19.23 -	config fr.cfg
   19.24 -label it
   19.25 -	config it.cfg
   19.26 -label reboot
   19.27 -	com32 reboot.c32
   19.28 -label uk
   19.29 -	config en.cfg
   19.30 -
   19.31 -implicit 0	
   19.32 -prompt 1	
   19.33 -timeout 80
   19.34 -F1 help.txt
   19.35 -F2 options.txt
   19.36 -F3 isolinux.msg
   19.37 -F4 display.txt
   19.38 -F5 enhelp.txt
   19.39 -F6 enopts.txt
   19.40 +include common.inc