--- mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class	2012/08/13 11:27:11	2024
+++ mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class	2012/08/13 11:28:11	2025
@@ -24,7 +24,7 @@
 {
 	local value="$1"
 	local rate
-	local CONFIG="${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"
+	local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"
 
 	case ${value} in
 		slow) rate="1000 10" ;;
@@ -40,21 +40,30 @@
 	# rebuild autostart file
 	helper_rebuild_fluxbox_autostart
 
-	x11runas "xset r rate ${rate}"
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		x11runas "xset r rate ${rate}"
+	fi
 }
 
 get_input_keymap()
 {
 	local keymap
-	keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
-	rvecho "keymap"
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
+	else
+		keymap=$(grep "Option.*XkbLayout" ${MROOT}/etc/X11/xorg.conf.d/25-layout.conf \
+			| sed -e 's:\"::' -e 's:.*XkbLayout\(.*\):\1:' -e 's:[\ \t]::g')
+	fi	
+	rvecho "${keymap}"
 }
 
 # set_input_keyboard
 set_input_keymap()
 {
 	local value="$1"
-	local CONFIG="/etc/X11/xorg.conf.d/25-layout.conf"
+	local CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-layout.conf"
 
 	[[ -z ${value} ]] && help_input_keymap && return 1
 
@@ -66,5 +75,8 @@
 	addconfig "	Option \"XkbLayout\" \"${value}\""
 	addconfig 'EndSection'
 
-	x11runas "setxkbmap ${value}"
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		x11runas "setxkbmap ${value}"
+	fi
 }