diff options
author | Dirk von Suchodoletz | 2007-03-01 23:33:15 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-03-01 23:33:15 +0100 |
commit | 0bc0de926455aacd2140c216335b0f91eefe85e2 (patch) | |
tree | 384cc529e7d984a2b548201be89d6231cc572504 /initramfs/initrd-stuff | |
parent | Small bug ... (diff) | |
download | core-0bc0de926455aacd2140c216335b0f91eefe85e2.tar.gz core-0bc0de926455aacd2140c216335b0f91eefe85e2.tar.xz core-0bc0de926455aacd2140c216335b0f91eefe85e2.zip |
Heavy cleanup, proper variable assignement for D_XORGBIN (instead of
XBinPath in displayvars), bugfix ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@740 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff')
-rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 26 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 19 |
2 files changed, 19 insertions, 26 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index 47c53c45..5125b311 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -22,7 +22,6 @@ local xfc=$1 local HSYNCRANGE="31.5-63.5" local VSYNCRANGE="60-90" local DEFAULTMODES='"1024x768" "800x600" "640x480"' -local DEFAULTCOLORDPT=24 # set variables representing the xorg.conf sections (version 6.9.x) # variables might be overwritten via displayvars function local Module='\tLoad\t\t"dbe"\n @@ -76,7 +75,7 @@ local Device='\tIdentifier\t"StdGraphics"\n local Screen='\tIdentifier\t"Screen 1"\n \tDevice\t\t"StdGraphics"\n \tMonitor\t\t"Default"\n -\tDefaultColorDepth CDP' +\tDefaultColorDepth 24' local ServerLayout='\tIdentifier\t"Simple Layout"\n \tScreen\t\t"Screen 1"\n \tInputDevice\t"Keyboard1"\t"CoreKeyboard"\n @@ -88,30 +87,27 @@ local ServerLayout='\tIdentifier\t"Simple Layout"\n local DRI='\tGroup\t\t"video"\n \tMode\t\t0666' -# displayvars may overwrite the above settings +# displayvars may overwrite the above settings and define pathes below e.g. +# synapticsdrv displayvars # run localizator and configure X11 keyboard localization "${country}" if [ -z "${XKEYBOARD}" ] ; then - error "$hcfg_keyb" nonfatal + error "${hcfg_keyb}" nonfatal XKEYBOARD="de" fi # check if hardware definition variables are set and overwrite autodetected # values -if [ -n "$hw_graphic" ] ; then +if [ -n "${hw_graphic}" ] ; then DRV=${hw_graphic% *} - CDP=${hw_graphic##* } - if [ -z "$DRV" ] ; then error "$hcfg_gfxdrv" nonfatal + if [ -z "$DRV" ] ; then error "${hcfg_gfxdrv}" nonfatal XMODULE=vesa fi fi -if [ -z "$CDP" ] ; then error "$hcfg_gfxcdp" nonfatal - CDP=${DEFAULTCOLORDPT} -fi -if [ -n "$hw_monitor" ] ; then +if [ -n "${hw_monitor}" ] ; then # just cut all starting from k(Hz) ... HS=${hw_monitor%k*} VS=${hw_monitor%Hz*} @@ -198,18 +194,17 @@ for section in Files ServerFlags Module InputDevice Monitor \ # if special synaptics touchpad was detected and specific driver # is present if strinfile "synaptics" /tmp/hwsetup.info && \ - test -e /mnt/usr/X11R6/lib/modules/input/synaptics_drv.o ; then + test -e /mnt/${synapticsdrv} ; then echo -e $InputMouseSyn >>$xfc else echo -e $InputMouseDef >>$xfc fi ;; Screen) - echo -e ${Screen} | sed -e "s,CDP,${CDP}," >>$xfc + echo -e ${Screen} >>$xfc for BPP in 15 16 24 do echo -e '\tSubSection "Display"\n\t\tDepth\t'\ $BPP'\n\t\tModes\t'$SCR_MODES'\n\tEndSubSection' >>$xfc - [ $BPP = "$CDP" ] && break done ;; ServerLayout) @@ -467,7 +462,7 @@ fi if [ -f /rootfs${D_XF86CONFFILE#/mnt} ] ; then echo "ready" > /tmp/xready else - . /etc/sysconfig/xserver >/dev/null 2>&1 || error "$hcfg_hwsetup" nonfatal + . /etc/sysconfig/xserver >/dev/null 2>&1 || error "${hcfg_hwsetup}" nonfatal ( displaysetup /etc/xorg.conf; echo "ready" > /tmp/xready ) & fi @@ -525,4 +520,3 @@ case $1 in echo "hwsetup finished at $(sysup)" > /tmp/hwcfg ;; esac - diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 13bf01ee..08c36931 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (c) 2003 - 2006 - RZ Uni Freiburg # Copyright (c) 2006, 2007 - OpenSLX GmbH # @@ -456,7 +455,6 @@ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\ # define type of X session dsx="no" - init="#7:5:respawn:/usr/X11R6/bin/X vt7 -quiet" case "$start_x" in yes|YES|direct|DIRECT|query|QUERY) # direct connection onto the own displaymanager, which @@ -466,19 +464,20 @@ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\ dsx="yes" xdmcp="false" echo -e "# /etc/X11/Xservers - file generated by \ -$0: $date\n:0 local /usr/X11R6/bin/X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers +$0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers ;; broadcast|BROADCAST) # the client will XDMCP broadcast and choose first available # X11 server - [ "x$start_xdmcp" = "xgdm" ] || init="$init -broadcast" + [ "x$start_xdmcp" = "xgdm" ] || \ + init="7:5:respawn:${D_XORGBIN} vt7 -quiet -broadcast" ;; indirect|INDIRECT) # the client will try to XDMCP connect list of X11 servers if [ "x$start_xdmcp" = "xgdm" ] ; then init="" else - init="$init -indirect $host_name" + init="7:5:respawn:${D_XORGBIN} vt7 -quiet -indirect $host_name" fi [ "x$start_xdmcp" = "xno" ] && start_xdmcp="yes" xdmcp="true" @@ -508,11 +507,11 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \ ;; esac echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab - displayvars - if [ -n $XBinPath ] ; then - testmkd /mnt/var/X11R6/bin - ln -sf $XBinPath /mnt/var/X11R6/bin/X - fi + # most probably not needed any longer + #if [ -n ${D_XORGBIN} ] ; then + # testmkd /mnt/var/X11R6/bin + # ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X + #fi fi # setup requested display manager |