diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 16:09:46 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 16:09:46 +0100 |
| commit | 4d7dbff90b8333deb2c2c3c0dbd1aa3e9aafa3d5 (patch) | |
| tree | 3e9062373817c4c2332889b18029038cb5dfdf0e /src/core/libs/lib-ui.sh | |
| parent | 0fc9ade9bbd89355acef54733378066aeaf265cb (diff) | |
fixes in set_keymap
Diffstat (limited to 'src/core/libs/lib-ui.sh')
| -rw-r--r-- | src/core/libs/lib-ui.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index d7481e4..b7f24f9 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -634,17 +634,21 @@ set_keymap () for i in $(find $KBDDIR/keymaps -name "*.gz" | sort); do KEYMAPS="$KEYMAPS ${i##$KBDDIR/keymaps/} -" done - ask_option "$var_KEYMAP" "Select A Keymap" '' optional $KEYMAPS && { + ask_option "$var_KEYMAP" "Select A Keymap" '' optional $KEYMAPS + if [ -n "$ANSWER_OPTION" ] + then loadkeys -q $KBDDIR/keymaps/$ANSWER_OPTION var_KEYMAP=$ANSWER_OPTION - } + fi FONTS= # skip .cp.gz and partialfonts files for now see bug #6112, #6111 for i in $(find $KBDDIR/consolefonts -maxdepth 1 ! -name '*.cp.gz' -name "*.gz" | sed 's|^.*/||g' | sort); do FONTS="$FONTS $i -" done - ask_option "$var_CONSOLEFONT" "Select A Console Font" '' optional $FONTS && { + ask_option "$var_CONSOLEFONT" "Select A Console Font" '' optional $FONTS + if [ -n "$ANSWER_OPTION" ] + then var_CONSOLEFONT=$ANSWER_OPTION for i in 1 2 3 4 do @@ -654,5 +658,5 @@ set_keymap () setfont $KBDDIR/consolefonts/$var_CONSOLEFONT -C /dev/tty$i fi done - } + fi } |