Re: [patch] changing default keyboard layout
Samy PERSEHAIE <spersehaie@virtual-net.fr> writes:
> 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.
I don't understand what you are doing with this patch. AFAICT, it's
going to suppress the "select a keyboard step" *either* if the
bootargs has a keyboard, or if the KBD define is present when
debootstrap is built (and that is now passed thru from the top level
'config' file).
Is that correct?
If so, I would like to mod the patch to *not* enable setting KBD by
default, since I don't know what would be the benefit of suppressing
this question during install...
Also, the patch had a number of problems based on the fact that you
left French defines. I attach a corrected version of it.
--
...Adam Di Carlo..<adam@onshore-devel.com>...<URL:http://www.onshored.com/>
? closed_in_2.3.6
? kbd.diff
? kbd_aph.diff
? tester-doc.html
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/16 21:01:04
@@ -117,7 +117,7 @@
LINGUA := C
# 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 := qwerty/us
##
## alpha-specific configuration (other archs can ignore this)
Index: debian/changelog
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/debian/changelog,v
retrieving revision 1.650
diff -u -r1.650 changelog
--- debian/changelog 2001/09/16 20:49:43 1.650
+++ debian/changelog 2001/09/16 21:01:10
@@ -76,7 +76,7 @@
with the 1.2MB images
- fix minor SGML build issues
* Chris Tillman
- - various documentation fixes.
+ - numerous documentation fixes and updates
* Marcin Owsiany
- various language chooser fixes; this is reputed to work now
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/16 21:01:10
@@ -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/16 21:01:10
@@ -309,7 +309,15 @@
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;
bufT = _("Your keyboard has not yet been configured. Please select \"Next\" from the menu to configure the keyboard.");
Reply to: