fix set keymap

lib/util-menu.sh

@@ -69,6 +69,7 @@ prep_menu() {
 
         case $(cat ${ANSWER}) in
             "1") select_keymap
+                 set_keymap
                  ;;
             "2") show_devices
                  ;;

lib/util.sh

@@ -229,13 +229,11 @@ set_language() {
     check_for_error "set LANG=${CURR_LOCALE}" $?
     ini system.lang "$CURR_LOCALE"
 
-    loadkeys $KEYMAP 2>$ERR
-    check_for_error "loadkeys $KEYMAP" "$?"
-    ini linux.keymap "$KEYMAP"
-
     setfont $FONT 2>$ERR
     check_for_error "set font $FONT" $?
     ini linux.font "$FONT"
+
+    select_keymap
 }
 
 # set locale, keymap and font and source translation file for installer
@@ -336,6 +334,12 @@ select_keymap() {
     KEYMAP=$(cat ${ANSWER})
 }
 
+set_keymap() {
+    loadkeys $KEYMAP 2>$ERR
+    check_for_error "loadkeys $KEYMAP" "$?"
+    ini linux.keymap "$KEYMAP"
+}
+
 mk_connection() {
     if [[ ! $(ping -c 2 google.com) ]]; then
         DIALOG " $_NoCon " --yesno "\n$_EstCon\n " 0 0 && $NW_CMD && return 0 || clear && exit 0