From a0d481efb92af6014374f3a05411ee59ee230579 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 18 Mar 2013 16:35:13 +0200
Subject: [PATCH] setxkbmap: init: update for new settings addon

---
 packages/x11/app/setxkbmap/init.d/72_keyboard | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard
index 32478732e2..3bbfa64500 100644
--- a/packages/x11/app/setxkbmap/init.d/72_keyboard
+++ b/packages/x11/app/setxkbmap/init.d/72_keyboard
@@ -23,23 +23,15 @@
 # runlevels: openelec
 
 (
-  if [ -f /var/config/settings.conf ]; then
-    . /var/config/settings.conf
+  if [ -f /storage/.cache/xkb/layout ]; then
+    . /storage/.cache/xkb/layout
 
     progress "setup keyboard layout"
 
-    if [ -z $X11_KEYMAP ]; then
-      X11_KEYMAP="us"
-    fi
-
     # waiting for Xorg to start
       wait_for_xorg
 
     # setup keymap
-      if [ -z $X11_KEYMAP2 ]; then
-        setxkbmap -display $DISPLAY $X11_KEYMAP;
-      else
-        setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
-      fi
+      setxkbmap -display $DISPLAY -layout "$XKBLAYOUT" -model "$XKBMODEL" -option "grp:alt_shift_toggle";
   fi
 )&