Some fixes for problems Reiner reported ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1424 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 16 insertions, 19 deletions

diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index c035d8fe..7512718f 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -248,17 +248,25 @@ else
   D_XF86CONFFILE="/mnt/etc/X11/xorg.conf"
   error "$hcfg_xcfg" nonfatal
 fi
-# move Xorg configuration if no xorg.conf file was provided by ConfigTGZ 
+# finish Xorg configuration if no xorg.conf file was provided by ConfigTGZ 
 # (check for /rootfs/${D_XF86CONFFILE#/mnt})
-if [ ! -f /rootfs${D_XF86CONFFILE#/mnt} ] ; then
+if [ ! -f /rootfs${D_XF86CONFFILE#/mnt} ] ; then 
+  xfc="/tmp/xorg.conf"
   . /etc/sysconfig/xserver >/dev/null 2>&1 || error "${hcfg_hwsetup}" nonfatal
   # replace OSS 3D server with proprietary one
   checkgraphix
-  sed -e "s/\"vesa\"/\"${XMODULE}\"/" -i /tmp/xorg.conf
+  sed -e "s/\"vesa\"/\"${XMODULE}\"/" -i $xfc
   # check for 64bit CPU/installation (fixme!!)
   [ -d "/mnt/usr/X11R6/lib64/modules" ] && \
     sed -e "/Section \"Files\"/a\ \ ModulePath    \"/usr/X11R6/lib64/modules\"" \
      -i $xfc
+  # run localizator and configure X11 keyboard
+  localization "${country}"
+  if [ -z "${XKEYBOARD}" ] ; then
+    XKEYBOARD="us"
+    error "${xcfg_keyb}" nonfatal
+  fi
+  sed "s/XKEYBOARD/${XKEYBOARD}/" -i $xfc
   # check for kind of xorg module used
   # if intel
   #   915resolution -l|sed -n "/32 bits/p" > /tmp/ires
diff --git a/initramfs/initrd-stuff/bin/xconfig b/initramfs/initrd-stuff/bin/xconfig
index 54113fec..c00c386d 100755
--- a/initramfs/initrd-stuff/bin/xconfig
+++ b/initramfs/initrd-stuff/bin/xconfig
@@ -27,12 +27,12 @@ if [ $dim -lt 750 ] ; then
 # 17" crt displays, little bit smaller than tfts
 elif [ $dim -lt 900 ] ; then
   crt="CRT 17inch"
-  echo "1280x1024\n1152x864" > /tmp/res
+  echo -e "1280x1024\n1152x864" > /tmp/res
 # 19" crt / sub 19" tft
 elif [ $dim -lt 1000 ] ; then
   if [ $year -lt 2001 ] ; then
     crt="CRT 19inch"
-    echo "1400x1050\n1280x1024\n1152x864" > /tmp/res
+    echo -e "1400x1050\n1280x1024\n1152x864" > /tmp/res
   else
     crt="TFT 4:3 17''"
   fi
@@ -42,7 +42,7 @@ elif [ $dim -lt 1200 ] ; then
     crt="TFT 4:3 18(+)''"
   else
     crt="CRT 20''"
-    echo "1400x1050\n1280x1024\n1152x864" > /tmp/res
+    echo -e "1400x1050\n1280x1024\n1152x864" > /tmp/res
   fi
 # sub 22" displays are crts if older than 2004 :)
 elif [ $dim -lt 1300 ] ; then
@@ -50,7 +50,7 @@ elif [ $dim -lt 1300 ] ; then
     crt="TFT 4:3 19(+)''"
   else
     crt="CRT 20(+)''"
-    echo "1600x1200\n1400x1050\n1280x1024\n1152x864" > /tmp/res
+    echo -e "1600x1200\n1400x1050\n1280x1024\n1152x864" > /tmp/res
   fi
 # any bigger display is most probably a tft
 elif [ $year -ge 2004 ] ; then
@@ -228,13 +228,6 @@ else
   fi
 fi
 sed "s/Modes        \"/Modes       ${Modes} \"/" -i $xfc
-# run localizator and configure X11 keyboard
-localization "${country}"
-if [ -z "${XKEYBOARD}" ] ; then
-  XKEYBOARD="us"
-  error "${xcfg_keyb}" nonfatal
-fi
-sed "s/XKEYBOARD/${XKEYBOARD}/" -i $xfc
 # displayvars
 #displayvars
 #sed "/Section \"Device\"/a\ \ ${Files}" -i $xfc
diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages
index 32d9e0a5..da5fb4fb 100644
--- a/initramfs/initrd-stuff/etc/messages
+++ b/initramfs/initrd-stuff/etc/messages
@@ -198,8 +198,6 @@ default resolutions (defined in xconfig)"
 hcfg_hwsetup="  Expected information from hwsetup to appear in \
 /tmp/hwsetup.info.\n  Unable to configure parts of the systems hardware. \
 Please check that\n  hwsetup is properly installed and executable."
-
-# messages from xconfig
-xcfg_keyb="  No settings found for keyboard, using default of '${XKEYBOARD}' \
+hcfg_keyb="  No settings found for keyboard, using default of '${XKEYBOARD}' \
 defined\n  in $0."
 
diff --git a/initramfs/initrd-stuff/etc/messages.de b/initramfs/initrd-stuff/etc/messages.de
index 0f723cb4..6e7580e1 100644
--- a/initramfs/initrd-stuff/etc/messages.de
+++ b/initramfs/initrd-stuff/etc/messages.de
@@ -209,8 +209,6 @@ Standard-Aufloesungen (defined in xconfig)"
 hcfg_hwsetup="  Erwartete Informationen von hwsetup in \
 /tmp/hwsetup.info.\n  Teile des Systems koennen nicht eingerichtet werden. \
 Bitte pruefen, dass\n  hwsetup richtig installiert und ausfuehrbar ist."
-
-# messages from xconfig
 hcfg_keyb="  Keine Einstellungen fuer ihre Tastatur gefunden, verwende den \
 Standard-Wert '${XKEYBOARD}' definiert\n  in $0."