From 853aca7cae3b740c742374e1d0236afc50ce4c38 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 11 Jan 2009 23:24:17 +0000
Subject: Trivial optimization in xserver plugin ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2467 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/XX_xserver.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index c5e2e73c..10960d5a 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -36,8 +36,7 @@ testmkd ${glliblinks}
 if [ -e /initramfs/plugin-conf/xserver.conf -a \
    ! -f /rootfs/etc/X11/xorg.conf ]; then
   . /initramfs/plugin-conf/xserver.conf
-  # keyboard setup
-  localization "${country}"
+
   # do not start any configuration if the admin provided a preconfigured
   # xorg.conf in /rootfs/etc/X11/xorg.conf
   if [ $xserver_active -ne 0 -a ! -f /rootfs/${xfc#/mnt} ]; then
@@ -176,6 +175,8 @@ EndSection
 Section "DRI"
   Mode    0666
 EndSection' >> $xfc
+    # keyboard setup (fill XKEYBOARD)
+    localization "${country}"
     # if no module was detected, stick to vesa module
     if [ -n "$xmodule" ] ; then
       sed "s/vesa/$xmodule/;s/\"us\"/\"${XKEYBOARD}\"/" -i $xfc
-- 
cgit v1.2.3-55-g7522