Page MenuHomeFreeBSD
Files F144043455

D8734.id22812.diff
No OneTemporary
Actions

D8734.id22812.diff
View Options

Index: usr.sbin/bsdconfig/console/keymap
===================================================================
--- usr.sbin/bsdconfig/console/keymap
+++ usr.sbin/bsdconfig/console/keymap
@@ -172,6 +172,7 @@
uk.iso) defaultitem="$msg_uk_iso" ;;
ua.koi8-u) defaultitem="$msg_ukrainian_koi8_u" ;;
ua.koi8-u.shift.alt) defaultitem="$msg_ukrainian_koi8_u_koi8_r" ;;
+ us.ctrl) defaultitem="$msg_usa_capslock_ctrl" ;;
us.pc-ctrl) defaultitem="$msg_usa_capslock_ctrl" ;;
us.dvorak) defaultitem="$msg_usa_dvorak" ;;
us.dvorakl) defaultitem="$msg_usa_dvorak_left" ;;
@@ -307,7 +308,14 @@
uk_iso) keymap_to_set="uk.iso" ;;
ukrainian_koi8_u) keymap_to_set="ua.koi8-u" ;;
ukrainian_koi8_u_koi8_r) keymap_to_set="ua.koi8-u.shift.alt" ;;
- usa_capslock_ctrl) keymap_to_set="us.pc-ctrl" ;;
+ usa_capslock_ctrl)
+ if [ $(sysctl -n kern.vty) -ne "vt" ];
+ then
+ keymap_to_set="us.pc-ctrl"
+ else
+ keymap_to_set="us.ctrl"
+ fi
+ ;;
usa_dvorak) keymap_to_set="us.dvorak" ;;
usa_dvorak_left) keymap_to_set="us.dvorakl" ;;
usa_dvorak_right) keymap_to_set="us.dvorakr" ;;
Index: usr.sbin/bsdconfig/share/keymap.subr
===================================================================
--- usr.sbin/bsdconfig/share/keymap.subr
+++ usr.sbin/bsdconfig/share/keymap.subr
@@ -39,7 +39,11 @@
# Defaults taken from usr.sbin/kbdmap/kbdmap.h
#
: ${DEFAULT_LANG:=en}
-: ${DEFAULT_KEYMAP_DIR:=/usr/share/syscons/keymaps}
+if [ $(sysctl -n kern.vty) -ne "vt" ]; then
+ : ${DEFAULT_KEYMAP_DIR:=/usr/share/syscons/keymaps}
+else
+ : ${DEFAULT_KEYMAP_DIR:=/usr/share/vt/keymaps}
+fi
############################################################ GLOBALS

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 4, 8:06 PM (7 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28437359
Default Alt Text
D8734.id22812.diff (1 KB)

Event Timeline