--- mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in	2015/09/11 07:36:40	2499
+++ mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in	2015/09/11 08:20:34	2500
@@ -16,7 +16,9 @@
 	local graphic_driver
 	local monitor_info
 	local monitor_resolution
+	local keymap
 	local hwdetected
+	local i
 
 	if [[ -z ${serial} ]]
 	then
@@ -92,6 +94,24 @@
 		decho "no monitor_resolution found"
 	fi
 
+	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
+
+	# now setup some empty database entries if the does not exist
+	for i in user root vnc
+	do
+		if [[ -z $(mysqldo "select ${i} from client_auth where serial=${serial};") ]]
+		then
+			decho "set empty ${i} pass"
+			import_resource client_auth "${serial}" "${i}" ""
+		fi
+	done
+
 	# update the hwdetected flags
 	import_resource client_serials "${serial}" hwdetected 1
 }