diff options
| author | thompsa <thompsa@FreeBSD.org> | 2006-03-15 21:20:01 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2006-03-15 21:20:01 +0000 |
| commit | 50c2d936c43eb02fa1e63a9481bb1adcef1e5857 (patch) | |
| tree | bbb654e88996404c27becb8872924512383a16d1 | |
| parent | bf44b2399142c5c19044b8ec077d24f575b4837d (diff) | |
| download | FreeBSD-src-50c2d936c43eb02fa1e63a9481bb1adcef1e5857.zip FreeBSD-src-50c2d936c43eb02fa1e63a9481bb1adcef1e5857.tar.gz | |
If a keymap file is not found for the selected country then default to the more
common USA ISO rather than index 0 (Belgian).
Reviewed by: jhb
MFC after: 1 day
| -rw-r--r-- | usr.sbin/sade/keymap.c | 7 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/keymap.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/sade/keymap.c b/usr.sbin/sade/keymap.c index f6dcfd6..de5b8c6 100644 --- a/usr.sbin/sade/keymap.c +++ b/usr.sbin/sade/keymap.c @@ -103,8 +103,11 @@ keymapMenuSelect(dialogMenuItem *self) if ((choice = keymapSetDefault(prefix)) == -1) { snprintf(prefix, sizeof(prefix), "keymap=%s", lang); - if ((choice = keymapSetDefault(prefix)) == -1) - choice = 0; + if ((choice = keymapSetDefault(prefix)) == -1) { + snprintf(prefix, sizeof(prefix), "keymap=us.iso", lang); + if ((choice = keymapSetDefault(prefix)) == -1) + choice = 0; + } } dmenuSetDefaultIndex(&MenuSysconsKeymap, &choice, &scroll, &curr, &max); diff --git a/usr.sbin/sysinstall/keymap.c b/usr.sbin/sysinstall/keymap.c index f6dcfd6..de5b8c6 100644 --- a/usr.sbin/sysinstall/keymap.c +++ b/usr.sbin/sysinstall/keymap.c @@ -103,8 +103,11 @@ keymapMenuSelect(dialogMenuItem *self) if ((choice = keymapSetDefault(prefix)) == -1) { snprintf(prefix, sizeof(prefix), "keymap=%s", lang); - if ((choice = keymapSetDefault(prefix)) == -1) - choice = 0; + if ((choice = keymapSetDefault(prefix)) == -1) { + snprintf(prefix, sizeof(prefix), "keymap=us.iso", lang); + if ((choice = keymapSetDefault(prefix)) == -1) + choice = 0; + } } dmenuSetDefaultIndex(&MenuSysconsKeymap, &choice, &scroll, &curr, &max); |
