diff options
| author | Dirk von Suchodoletz | 2007-01-31 20:11:02 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-01-31 20:11:02 +0100 |
| commit | 1ad51ac519e7afc970a5ddf991c9141e140bf7f3 (patch) | |
| tree | 2b35cf904a5e029ee2da9a355976a47d7c6ab670 /initramfs/initrd-stuff/bin/servconfig | |
| parent | Use the right variable name of the existing path. (diff) | |
| download | core-1ad51ac519e7afc970a5ddf991c9141e140bf7f3.tar.gz core-1ad51ac519e7afc970a5ddf991c9141e140bf7f3.tar.xz core-1ad51ac519e7afc970a5ddf991c9141e140bf7f3.zip | |
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
Diffstat (limited to 'initramfs/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 33 |
1 files changed, 25 insertions, 8 deletions
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 @@ -83,6 +83,23 @@ echo " ">/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 # * VM images via additional mount (mount source NFS, NBD, ...) @@ -118,14 +135,6 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then 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 ... # the root password provided by machine-setup is used only if no passwd file @@ -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 |