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/bin/servconfig | |
| 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/bin/servconfig')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 19 |
1 files changed, 9 insertions, 10 deletions
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 |