# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1211058202 0
# Node ID 97526a91fabbb5736cf2f5ce3f9a74e3e8ae61ce
# Parent  296dbd15f4b27763c92bcd9b9c9137e7eb134a62
syslinux: fix keyboard, tip in splash screen

diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/receipt
--- a/syslinux/receipt	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/receipt	Sat May 17 21:03:22 2008 +0000
@@ -13,20 +13,13 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 compile_rules()
 {
-	cd $src
-	sed "s|\\\$DEFAULT_PATH = .*|\$DEFAULT_PATH = \"$PWD\";|" \
-		> mkkbd < keytab-lilo.pl
-	chmod +x mkkbd
-	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do
-		[ "$(dirname $i)" = "include" ] && continue
-		j=$(basename $i)
-		zcat /usr/share/kbd/keymaps/i386/$i > ${j%.gz}
-	done
-	for i in $(ls *.map); do
-		i=$(basename $i)
-		i=${i%.map}
-		./mkkbd $i > $i.kbd
-	done
+    cd $src
+    for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
+        [ "$(basename $(dirname $i))" = "include" ] && continue
+        j=$(basename $i)
+        j=${j%.map.gz}.kbd
+        ./keytab-lilo.pl /usr/share/kbd/keymaps/i386/qwerty/us.map.gz $i > $j
+    done
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -37,8 +30,10 @@
     cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
     cp stuff/* $fs/boot/isolinux
     rm -r $fs/boot/isolinux/slitaz.* $fs/boot/isolinux/*.kbd 2> /dev/null
-    for i in $(grep kbd$ $fs/boot/isolinux/*.cfg | cut -d' ' -f2); do
-        cp $src/$i $fs/boot/isolinux
+    grep kbd$ $fs/boot/isolinux/*.cfg | while read cfg kbd; do
+        cfg=$(basename ${cfg%.cfg:*})
+	sed -i "s/$kbd/$cfg.kbd/" $fs/boot/isolinux/$cfg.cfg
+        cp $src/$kbd $fs/boot/isolinux/$cfg.kbd
     done
     chown root.root $fs/boot/isolinux/*
 }
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/be.cfg
--- a/syslinux/stuff/be.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/be.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP be-latin1.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=be-latin1
 
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/ca.cfg
--- a/syslinux/stuff/ca.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/ca.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP cf.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=cf
 
-label be
-	config be.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-	
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/common.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/common.inc	Sat May 17 21:03:22 2008 +0000
@@ -0,0 +1,38 @@
+display isolinux.msg
+default slitaz
+label be
+	config be.cfg
+label ca
+	config ca.cfg
+label ch
+	config fr_CH.cfg
+label de
+	config de_CH.cfg
+label en
+	config en.cfg
+label es
+	config es.cfg
+label fi
+	config fi.cfg
+label fr
+	config fr.cfg
+label hu
+	config hu.cfg
+label it
+	config it.cfg
+label reboot
+	com32 reboot.c32
+label uk
+	config en.cfg
+label us
+	config us.cfg
+
+implicit 0	
+prompt 1	
+timeout 80
+F1 help.txt
+F2 options.txt
+F3 isolinux.msg
+F4 display.txt
+F5 enhelp.txt
+F6 enopts.txt
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/de_CH.cfg
--- a/syslinux/stuff/de_CH.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/de_CH.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP de_CH-latin1.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=de_DE kmap=de_CH-latin1
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label def
-	config isolinux.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/en.cfg
--- a/syslinux/stuff/en.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/en.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,37 +1,6 @@
-display isolinux.msg
 KBDMAP uk.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=C kmap=uk
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/enopts.txt
--- a/syslinux/stuff/enopts.txt	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/enopts.txt	Sat May 17 21:03:22 2008 +0000
@@ -15,7 +15,7 @@
                  Example : config=/dev/hda1,slitaz.sh
  modprobe=<module_list> : Force module(s) to load.
  lang=* :        Select language [en,fr_CH,fr_FR]
- kmap=* :        Select keyboard [be,ca,de,en,es,fr,fr_CH,it,jp,us]
+ kmap=* :        Select keyboard [be,ca,de,en,es,fi,fr,fr_CH,hu,it,jp,us]
  sound=no :      Remove all sound kernel modules.
  sound=noconf :  Do not configure sound card.
  screen=<type> : Define screen type [text, 640x480x16..1920x1440x24]
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/es.cfg
--- a/syslinux/stuff/es.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/es.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP es.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=es_ES kmap=es
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label en
-	config en.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/fi.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/fi.cfg	Sat May 17 21:03:22 2008 +0000
@@ -0,0 +1,6 @@
+KBDMAP fi-latin1.kbd
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fi kmap=fi-latin1
+
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/fr.cfg
--- a/syslinux/stuff/fr.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/fr.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP fr-latin1.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=fr-latin1
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/fr_CH.cfg
--- a/syslinux/stuff/fr_CH.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/fr_CH.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP fr_CH-latin1.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_FR kmap=fr_CH-latin1
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label fr
-	config fr.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/hu.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/hu.cfg	Sat May 17 21:03:22 2008 +0000
@@ -0,0 +1,6 @@
+KBDMAP hu.kbd
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=hu kmap=hu
+
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/isolinux.cfg
--- a/syslinux/stuff/isolinux.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/isolinux.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,38 +1,5 @@
-display isolinux.msg
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/it.cfg
--- a/syslinux/stuff/it.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/it.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,39 +1,6 @@
-display isolinux.msg
 KBDMAP it.kbd
-default slitaz
 label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=it_IT kmap=it
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label def
-	config isolinux.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-label us
-	config us.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/options.txt
--- a/syslinux/stuff/options.txt	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/options.txt	Sat May 17 21:03:22 2008 +0000
@@ -15,7 +15,7 @@
                  peripherique. Exemple : config=/dev/hda1,slitaz.sh
  modprobe=<module_list> : Force le chargement de module(s).
  lang=* :        Specifie la langue [en,fr_CH,fr_FR]
- kmap=* :        Specifie le clavier [be,ca,de,en,es,fr,fr_CH,it,jp,us]
+ kmap=* :        Specifie le clavier [be,ca,de,en,es,fi,fr,fr_CH,hu,it,jp,us]
  sound=no :      Supprime tous les modules son du noyau.
  sound=noconf :  Ne configure pas la carte son.
  screen=<type> : Definit le type d'ecran [text,640x480x16..1920x1440x24]
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/slitaz.css
--- a/syslinux/stuff/slitaz.css	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/slitaz.css	Sat May 17 21:03:22 2008 +0000
@@ -118,6 +118,10 @@
 	display: block;
 }
 
+#nav i {
+	color: #DF8F06;
+}
+
 /* Page content */
 
 #content, #content_bottom, #content_top {
@@ -231,13 +235,13 @@
 	color: #3E1220;
 	background: inherit;
 	text-align: left;
-	margin: 0px 0px 16px -58px;
+	margin: 0px 0px 8px -58px;
 }
 
 h2 {
     color: #DF8F06;
     border-left: 10px solid #F3F3F3;
-    padding: 4px 0px 4px 4px;
+    padding: 0px 0px 0px 4px;
     margin: 0;
 }
 
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/slitaz.html
--- a/syslinux/stuff/slitaz.html	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/slitaz.html	Sat May 17 21:03:22 2008 +0000
@@ -22,7 +22,7 @@
 <div id="header">
     <a name="top"></a>
 <!-- Access -->
-    <a href="javascript:void(0);" onClick="window.open('slitaz.html','popup','width=640,height=350')"><img id="logo"
+    <a href="javascript:void(0);" onClick="window.open('slitaz.html','popup','width=640,height=370')"><img id="logo"
     src="http://www.slitaz.org/pics/website/logo.png" title="www.slitaz.org" alt="www.slitaz.org"
     style="border: 0px solid ; width: 200px; height: 74px;" /></a>
     <p id="titre">#!/LiveCD/boot</p>
@@ -32,11 +32,13 @@
 <div id="nav">
 <div id="nav_top"></div>
 <p>
-<u>Welcome</u>
+Hit <i>ENTER</i> to start or<br>
+<i>F5</i> for help 
 </p>
 <p>
-Hit <i>ENTER</i> to start or<br>
-<i>F5</i> for help 
+You may select your keyboard with <i>be</i>, <i>ca</i>, <i>de</i>,
+<i>en</i>, <i>es</i>, <i>fi</i>, <i>fr</i>, <i>fr_CH</i>, <i>hu</i>,
+<i>it</i>, <i>jp</i> or <i>us</i>.
 </p>
 <p>
 Login: <i>hacker</i> or <i>root</i>, password <i>root</i> 
@@ -56,16 +58,22 @@
 <div id="content">
 <a name="content"></a>
 
-<h1><font color="#3E1220">Bienvenue</font></h1>
+<h1><font color="black">Bienvenue - Welcome !</font></h1>
 <h2><font color="#DF8F06">Comment démarrer ?</font></h2>
 
 <p>
 <b>ENTER</b> pour booter, <b>F1</b> pour afficher la page d'aide.
+<br>
+[login] <b><i>hacker</i></b> ou <b><i>root</i></b> avec le mot de
+passe <b><i>root</i></b>.
 </p>
 
+<h2><font color="#DF8F06">Exemple, clavier français :</font></h2>
+
 <p>
-[login] <b><i>hacker</i></b> ou <b><i>root</i></b> avec le mot de
-passe <b><i>root</i></b>.
+ boot: <b>fr &lt;ENTER&gt;</b>
+<br>
+ boot: <b>&lt;ENTER&gt;</b>
 </p>
 
 </div>
@@ -78,11 +86,10 @@
 </div>
 
 <!-- Start of footer and copy notice -->
-<div id="copy">
+<div id="copy" color="white">
 <p>
 SliTaz GNU/linux - Simple Light Incredible Temporary Autonomous Zone
-</p>
-<p>
+<br>
 Copyright &copy; 2008 SliTaz - http://www.slitaz.org/
 </p>
 <!-- End of copy -->
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/splash.lss
Binary file syslinux/stuff/splash.lss has changed
diff -r 296dbd15f4b2 -r 97526a91fabb syslinux/stuff/us.cfg
--- a/syslinux/stuff/us.cfg	Sat May 17 21:36:03 2008 +0200
+++ b/syslinux/stuff/us.cfg	Sat May 17 21:03:22 2008 +0000
@@ -1,36 +1,5 @@
-display isolinux.msg
 default slitaz
-label slitaz
 	kernel /boot/bzImage
 	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=C kmap=us
 
-label be
-	config be.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de_CH.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fr
-	config fr.cfg
-label it
-	config it.cfg
-label reboot
-	com32 reboot.c32
-label uk
-	config en.cfg
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 help.txt
-F2 options.txt
-F3 isolinux.msg
-F4 display.txt
-F5 enhelp.txt
-F6 enopts.txt
+include common.inc