diff options
| author | Dirk von Suchodoletz | 2006-07-09 16:28:54 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-07-09 16:28:54 +0200 |
| commit | 91cd8bbd21cc205c8d113a3740e498f6bb780492 (patch) | |
| tree | ec8cd67ecde3901a06645b2b9660769a97e66bab /initrd/initrd-stuff/bin/servconfig | |
| parent | Added detection of i945G graphics adaptor. Local changes should go to (diff) | |
| download | core-91cd8bbd21cc205c8d113a3740e498f6bb780492.tar.gz core-91cd8bbd21cc205c8d113a3740e498f6bb780492.tar.xz core-91cd8bbd21cc205c8d113a3740e498f6bb780492.zip | |
Fix for certain keyboard (inactivity) problem, introduction of keytable
setup function ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@279 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 44f8be90..b6d5aedb 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -4,7 +4,7 @@ # for linux diskless clients (executed within initial # ramdisk) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-07-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 09-07-2006 # Michael Janczyk, 31-05-2006 # Lars Mueller, 23-06-2006 # Oliver Tappe, 23-06-2006 @@ -394,7 +394,7 @@ $0: $date\n:0 local /usr/X11R6/bin/X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers [ x$start_xdmcp != "x" ] || start_xdmcp="no"; init="7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7" echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: \ -$date\nsleep 3; while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null;\ +$date\nwhile ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null;\ do\n test -f /var/run/kiosk || break; sleep 3;\ndone\ntouch \ /var/run/kiosk\nresmgr login nobody tty7\nresmgr grant nobody desktop\n\ chown nobody /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/control*\n\ @@ -403,9 +403,11 @@ chown -R nobody.nobody /var/lib/nobody\nsu -c 'xinit /var/X11R6/bin/startgui \ $start_x -- vt7 -quiet' -l nobody &>/dev/null\nrm /var/run/kiosk\n\ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \ >/mnt/var/X11R6/bin/kiosk - # early start of kiosk session - echo -e "\t# kiosk start added by $0\n\t\ + # early start of kiosk session if not late_dm is set + if [ "x$late_dm" != "xyes" ] ; then + echo -e "\t# kiosk start added by $0\n\t\ /var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.ld + fi cp /etc/startgui /mnt/var/X11R6/bin chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui rm /mnt/var/run/kiosk 2>/dev/null |