projects / packages / kbd.git / blame
| Commit | Line | Data |
|---|---|---|
| 5c385ec4 JB |
1 | --- kbd-2.5.1/src/unicode_start.orig 2022-08-20 19:32:56.350906358 +0200 |
| 2 | +++ kbd-2.5.1/src/unicode_start 2022-08-20 19:58:04.852734102 +0200 | |
| 3 | @@ -11,6 +11,14 @@ case "$TTY" in | |
| 4 | ;; | |
| 5 | esac | |
| cece0307 | 6 | |
| 5c385ec4 JB |
7 | +DUMPKEYS_OPT= |
| 8 | +if [ -r /etc/sysconfig/console ]; then | |
| 9 | + . /etc/sysconfig/console | |
| 10 | + if [ -n "$KEYTABLE_CHARSET" ]; then | |
| 11 | + DUMPKEYS_OPT="-c$KEYTABLE_CHARSET" | |
| 12 | + fi | |
| 13 | +fi | |
| 14 | + | |
| 15 | # Enables Unicode processing in the current console. | |
| 16 | # | |
| 17 | # 1. The input side: the keyboard driver. | |
| 18 | @@ -49,13 +57,13 @@ if [ "$uid" = 0 ]; then | |
| 19 | mkdir -- "$HOME/.kbd" | |
| 20 | ||
| 21 | [ ! -w "$HOME/.kbd" ] || | |
| 93695b30 | 22 | - dumpkeys > "$HOME/.kbd/.keymap_sv" |
| 5c385ec4 JB |
23 | + dumpkeys $DUMPKEYS_OPT > "$HOME/.kbd/.keymap_sv" |
| 24 | fi | |
| 25 | ||
| 26 | # redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing | |
| 27 | # "plus before udiaeresis ignored" warnings. | |
| 28 | ||
| cece0307 | 29 | - dumpkeys | loadkeys --unicode > /dev/null 2>&1 |
| 5c385ec4 JB |
30 | + dumpkeys $DUMPKEYS_OPT | loadkeys --unicode > /dev/null 2>&1 |
| 31 | fi | |
| cece0307 JB |
32 | |
| 33 | # 2. The output side: the console screen. |