Hi,
I tried to change the default keyboard in boot-floppies/config, by modifying
"KBD", but nothing appends : "qwerty/us" stays as the default layout of
bootdisks.
I modified files "config", "utilities/dbootstrap/Makefile" and
"utilities/dbootstrap/main_menu.c" so that KBD is used.
I tried with KBD=azerty/latin1, and it worked perfectfly.
Regards.
--
Samy PERSEHAIE - VIRTUAL-NET http://www.virtual-net.fr
80, avenue des Buttes de Coesmes - 35700 RENNES
tel: +33 2 23 21 06 30 - fax: +33 2 99 38 16 85
--=[ Linux : C'est free, mais c'est pas grave... ]=--
Index: config
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/config,v
retrieving revision 1.94
diff -u -r1.94 config
--- config 2001/09/12 16:13:17 1.94
+++ config 2001/09/13 09:54:38
@@ -114,10 +114,10 @@
# (maybe this could just read from scripts/rootdisk/messages/languages)
langs := C cs de da eo es fi fr gl hr hu it ja pl pt ru sk sv tr
# default language
-LINGUA := C
+LINGUA := fr
# languages that use Latin-1 charset with accentuation, tilde, etc
-LATIN1 := pt es gl
+LATIN1 := fr pt es gl
# languages that use Latin-2 charset
LATIN2 := cs hr hu pl sk
# languages that use Latin-3 charset
@@ -127,10 +127,11 @@
# languages that use KOI8-R charset
KOI8-R := ru
-# Use KBD := C for US English keyboard, fr_FR, de_DE, es_ES, etc...
-# see utilities/dbootstrap/kbdconfig.[ch] for the complete list of
-# available keyboards.
-KBD := C
+# Use KBD := qwerty/us for US English keyboard, azerty/fr-latin0 (fr_FR with
+# Euro), qwertz/de-latin1-nodeadkeys for de_DE, qwerty/es for es_ES, etc... see
+# utilities/dbootstrap/kbdconfig.[ch] for the complete list of available
+# keyboards.
+KBD := azerty/fr-latin1
##
## alpha-specific configuration (other archs can ignore this)
Index: utilities/dbootstrap/Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- utilities/dbootstrap/Makefile 2001/09/11 07:39:24 1.98
+++ utilities/dbootstrap/Makefile 2001/09/13 09:54:40
@@ -67,6 +67,10 @@
CFLAGS += -DUSE_LANGUAGE_CHOOSER
endif
+ifdef KBD
+CFLAGS += -DKBD=\"$(KBD)\"
+endif
+
ifeq ($(FB),true)
CFLAGS += -DGRAPHICAL
LIBS += /usr/lib/libbogl.a
Index: utilities/dbootstrap/main_menu.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main_menu.c,v
retrieving revision 1.68
diff -u -r1.68 main_menu.c
--- utilities/dbootstrap/main_menu.c 2001/09/10 12:39:11 1.68
+++ utilities/dbootstrap/main_menu.c 2001/09/13 09:54:41
@@ -305,10 +305,16 @@
}
#endif
- /* check for boot-args (only if we're not already selected via the
lang stuff) */
+ /* check for boot-args (only if we're not already selected via the
+lang stuff) */
if (bootargs.kbd) {
configure_keyboard (bootargs.kbd);
goto done_keyboard;
+#ifdef KBD
+ } else {
+ /* change to keyboard defined in config (only if bootargs.kbd != NULL)
+*/
+ configure_keyboard (KBD);
+ goto done_keyboard;
+#endif
}
next_action = configure_keyboard_m;
