diff options
| author | Dirk von Suchodoletz | 2006-05-26 18:10:57 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-05-26 18:10:57 +0200 |
| commit | f5d8e98833698fec6a52b95064a3d01ddbbae3af (patch) | |
| tree | c4ee9a24960fa735b82b992ef22902382723b0cd /initrd/initrd-stuff/bin/servconfig | |
| parent | fix for the kiosk mode (permissions), fix for usb/vmware ... (diff) | |
| download | core-f5d8e98833698fec6a52b95064a3d01ddbbae3af.tar.gz core-f5d8e98833698fec6a52b95064a3d01ddbbae3af.tar.xz core-f5d8e98833698fec6a52b95064a3d01ddbbae3af.zip | |
fixes for kiosk mode
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@237 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index e0875798..dfbfa05f 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>, 24-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 26-05-2006 # Michael Janczyk, 24-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg @@ -262,7 +262,7 @@ config_snmp if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then # in the future other types of sources besides NFS should be supported for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \ - /var/run/vmware /mnt/etc/X11/sessions ; do + /var/run/vmware /etc/X11/sessions ; do testmkd /mnt/$i done # mount the vmware image source or link it (compatibility to ver. 3) @@ -385,17 +385,17 @@ $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\nwhile ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null ; do\n \ -sleep 3; test -f /tmp/kiosk || break; done\n\ -touch /tmp/kiosk +$date\nsleep 3; while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null;\ +do\n test -f /var/run/kiosk || break; sleep 3;\ndone\n\ +touch /var/run/kiosk resmgr login nobody tty7\nresmgr grant nobody desktop\nchown nobody \ /dev/dsp* /dev/audio* /dev/mixer*\nsu -c 'xinit /var/X11R6/bin/startgui \ -$start_x -- vt7 -quiet' -l nobody &>/dev/null\nrm /tmp/kiosk\n\ -resmgr revoke nobody\nresmgr logout tty7\nkillall X\nsleep 2" \ +$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( touch /tmp/kiosk; sleep 2; \ -/var/X11R6/bin/kiosk &>/dev/null ) &" >>/mnt/etc/${D_INITDIR}/boot.ld + echo -e "\t# kiosk start added by $0\n\t\ +/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.ld cp /etc/startgui /mnt/var/X11R6/bin chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui rm /mnt/tmp/kiosk 2>/dev/null |