From 1ad51ac519e7afc970a5ddf991c9141e140bf7f3 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 31 Jan 2007 19:11:02 +0000
Subject: Fixed slow stage3 in higher debuglevels (sleep -> usleep in
 /etc/functions) Heavy rewrite of base scripts init/hwautocfg/servconfig.
 Moved lots of stuff from hwautocfg to init and servconfig to get a cleaner
 structure (do not wait for processes of init or servconfig in hwautocfg)
 Cleanup started, old codefragments will be removed soon ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@661 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/servconfig | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'initramfs/initrd-stuff/bin/servconfig')

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 1cbae875..cbe7b187 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -82,6 +82,23 @@ echo "
    Diskless Workstation (v4.0.6/$dstr (c) <OpenSLX.ORG project>
 ">/mnt/etc/issue
 
+#############################################################################
+# set localization and add entries to initialize keytable and consolefont to
+# boot.ld
+DEFKEYTABLE="de-latin1-nodeadkeys"
+if [ -z "$country" ] ; then
+  error "$scfg_country" nonfatal
+  country="${D_DEFAULTCOUNTRY}"
+fi
+localization "${country}"
+if [ -z "${KEYTABLE}" ] ; then
+  error "$hcfg_keyb" nonfatal 
+  KEYTABLE=${DEFKEYTABLE}
+fi
+echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.ld
+[ -n "${KEYTABLE}" ] && keytable
+[ -n "${CONSOLE_FONT}" ] && consolefont
+
 #############################################################################
 # vmware stuff first part: two scenarios
 # * VM images in /usr/share/vmware - then simply link
@@ -117,14 +134,6 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   fi
 fi
 
-#############################################################################
-# set localization
-if [ -z "$country" ] ; then
-  error "$scfg_country" nonfatal
-  country="${D_DEFAULTCOUNTRY}"
-fi
-localization "${country}"
-
 #############################################################################
 # setup passwd and shadow for local system users like root, bin, daemon and
 # nobody if no user/admin provided passwd exists ...
@@ -493,6 +502,14 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
     ;;
   esac
   echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab
+  # wait for completion of Xorg configuration and finalize it
+  waitfor /tmp/xready 20000
+  cp /etc/xorg.conf /mnt/${D_XF86CONFFILE}
+  displayvars
+  if [ -n $XBinPath ] ; then
+    testmkd /mnt/var/X11R6/bin
+    ln -sf $XBinPath /mnt/var/X11R6/bin/X
+  fi
 fi
 
 # setup requested display manager
-- 
cgit v1.2.3-55-g7522