--- mcore-src/trunk/mcore-tools/src/modules/basic-input/input.control.class.in	2015/09/17 10:46:12	2578
+++ mcore-src/trunk/mcore-tools/src/modules/basic-input/input.control.class.in	2016/02/02 14:11:44	2755
@@ -1,5 +1,7 @@
 # $Id$
 
+push_firstboot 10_input_keymap
+
 push_config 10_input_keymap
 
 help_input_mouse()
@@ -67,3 +69,17 @@
 		control_client "${serial}" set input.keymap "${value}"
 	fi
 }
+
+push_firstboot_10_input_keymap()
+{
+	local serial="$1"
+	local keymap
+
+	keymap=$(mysqldo "select keymap from cfg_input where serial=${serial};")
+	if [[ -z ${keymap} ]] || [[ ${keymap} = NULL ]]
+	then
+		# set keymap to MCORE_DEFAULT_KEYMAP
+		decho "keymap='${MCORE_DEFAULT_KEYMAP}'"
+		import_resource cfg_input "${serial}" keymap "${MCORE_DEFAULT_KEYMAP}"
+	fi
+}