Hi,
Some older hppa boxes have keyboards for which we have a keymap
that works in the kernel, but don't have one in the console-data
pkg. For these systems I'd like to avoid selecting a keymap
during install. I can do that at the moment, but the installer
keeps prompting for keyboard config at each step. A nice simple
solution is to just offer the keyboard config once, and then if
the user hits cancel, don't offer again. In the second stage
install you will then be offerred keyboard config again, and you
can select to keep the kernel keytable. Diff below. What do
people think? I can commit it no-one objects, or I can make it
#if #cpu(hppa). Longer term, we can get a keymap in to console-data,
get the b-f build to pull it in, etc.
Richard
Index: utilities/dbootstrap/main_menu.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main_menu.c,v
retrieving revision 1.63
diff -u -r1.63 main_menu.c
--- utilities/dbootstrap/main_menu.c 2001/07/09 01:25:39 1.63
+++ utilities/dbootstrap/main_menu.c 2001/07/09 18:40:45
@@ -106,6 +106,7 @@
#ifndef _TESTING_
char *found_root = NULL;
#endif
+ int offerred_keyboard = 0;
struct stat statbuf;
int (*next_action) (void);
int (*alternate_action) (void);
@@ -278,11 +279,13 @@
if ((! NAME_ISREG (KEYBD_SETTINGS_FILE, &statbuf))
&& NAME_ISEXE ("/sbin/loadkmap", &statbuf)
&& (serialConsole < 0)
+ && (!offerred_keyboard)
#if #cpu (m68k)
&& (strcmp(Arch2, "VME") != 0)
#endif
) {
+ offerred_keyboard = 1;
#ifdef USE_LANGUAGE_CHOOSER
/* assert (lang != NULL); */
if (lang->keymap != NULL && lang->keymap[0] != '\0')