# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1203172739 -3600
# Node ID 3e5e2d719373b53da1853c4d8013880bddce1ecb
# Parent  a9bb18f42a7fb49610f07c9c1d82bc49dfca30b8
Syslinux: multiple kerboard (be,ca,ch,de,en,es,fr,it,us)

diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/receipt
--- a/syslinux/receipt	Sat Feb 16 15:28:52 2008 +0100
+++ b/syslinux/receipt	Sat Feb 16 15:38:59 2008 +0100
@@ -14,7 +14,6 @@
 {
     mkdir -p $fs/boot/isolinux
     cp -a $PACKAGE-$VERSION/isolinux.bin $fs/boot/isolinux
-    cp stuff/*.txt $fs/boot/isolinux
-    cp stuff/isolinux.* $fs/boot/isolinux
-    cp stuff/splash.lss $fs/boot/isolinux
+    cp -a $PACKAGE-$VERSION/com32/modules/reboot.c32 $fs/boot/isolinux
+    cp stuff/* $fs/boot/isolinux
 }
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/be.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/be.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+display isolinux.msg
+KBDMAP be.kbd
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr kmap=be
+
+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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/be.kbd
Binary file syslinux/stuff/be.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/ca.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/ca.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+display isolinux.msg
+KBDMAP ca.kbd
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr kmap=ca
+
+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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/ca.kbd
Binary file syslinux/stuff/ca.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/de_CH.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/de_CH.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+display isolinux.msg
+KBDMAP de_CH.kbd
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_CH kmap=fr_CH
+
+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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/de_CH.kbd
Binary file syslinux/stuff/de_CH.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/en.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/en.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,35 @@
+display isolinux.msg
+KBDMAP en.kbd
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=en kmap=en
+
+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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/en.kbd
Binary file syslinux/stuff/en.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/es.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/es.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+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=en 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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/es.kbd
Binary file syslinux/stuff/es.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/fr.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/fr.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+display isolinux.msg
+KBDMAP fr.kbd
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr kmap=fr
+
+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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/fr.kbd
Binary file syslinux/stuff/fr.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/fr_CH.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/fr_CH.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+display isolinux.msg
+KBDMAP fr_CH.kbd
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=fr_CH kmap=fr_CH
+
+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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/fr_CH.kbd
Binary file syslinux/stuff/fr_CH.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/help.txt
--- a/syslinux/stuff/help.txt	Sat Feb 16 15:28:52 2008 +0100
+++ b/syslinux/stuff/help.txt	Sat Feb 16 15:38:59 2008 +0100
@@ -8,11 +8,11 @@
  nombreuses commandes utiles, manipulation de fichiers, internet,
  etc.
 
- <ENTER>  Lance SliTaz.
- <F1>     Affiche cette page.
- <F2>     Liste les options disponibles au boot.
- <F3>     Affiche l'image splash.
- <F4>     Affiche le message de bienvenue.
+ <ENTER>          Lance SliTaz.
+ <F1>             Affiche cette page.
+ <F2>             Liste les options disponibles au boot.
+ <F3> ou <F4>     Affiche l'image splash ou le message de bienvenue.
+ be, ca, ch, de, en, es, fr, it ou us      Charge le clavier voulu.  
 
  Slitaz GNU/Linux est distribue sans aucune garantie, et publie 
  car potentiellement utile. SliTaz n'as aucune pretention, nous ne
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/isolinux.cfg
--- a/syslinux/stuff/isolinux.cfg	Sat Feb 16 15:28:52 2008 +0100
+++ b/syslinux/stuff/isolinux.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -3,6 +3,30 @@
 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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/it.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/it.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,37 @@
+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=en 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
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/it.kbd
Binary file syslinux/stuff/it.kbd has changed
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/options.txt
--- a/syslinux/stuff/options.txt	Sat Feb 16 15:28:52 2008 +0100
+++ b/syslinux/stuff/options.txt	Sat Feb 16 15:38:59 2008 +0100
@@ -14,13 +14,12 @@
                  home=usb monte la premiere partition (sda1) sur /home.
  config=<device>,<path> : Execute un script se trouvant sur un
                  peripherique. Exemple : config=/dev/hda1,slitaz.sh
- lang=* :        Specifie la langue a utiliser.
-                 [en,fr_CH,fr_FR]
- kmap=* :        Specifie le clavier a utiliser.
-                 [be,ca,de,en,es,fr,fr_CH,it,jp,us]
+ 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]
  sound=no :      Supprime tous les modules son du noyau.
  sound=noconf :  Ne configure pas la carte son.
  
  usage: slitaz [option]
- exemple: slitaz irqpoll vga=775 lang=fr_CH kmap=fr_CH
+ exemple: slitaz irqpoll vga=775 lang=fr_CH kmap=fr_CH modprobe=3c59x
  
diff -r a9bb18f42a7f -r 3e5e2d719373 syslinux/stuff/us.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/us.cfg	Sat Feb 16 15:38:59 2008 +0100
@@ -0,0 +1,34 @@
+display isolinux.msg
+default slitaz
+label slitaz
+	kernel /boot/bzImage
+	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal lang=en 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