diff options
| author | Dirk von Suchodoletz | 2006-05-20 00:45:22 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-05-20 00:45:22 +0200 |
| commit | c0c45928ef64b9d3ebfe960242b624e197d6db3c (patch) | |
| tree | f79458df30cf906083a736801da5f7920c18707e /initrd/initrd-stuff/bin/servconfig | |
| parent | small bugfixes (diff) | |
| download | core-c0c45928ef64b9d3ebfe960242b624e197d6db3c.tar.gz core-c0c45928ef64b9d3ebfe960242b624e197d6db3c.tar.xz core-c0c45928ef64b9d3ebfe960242b624e197d6db3c.zip | |
kiosk mode enabled, cleanup in functions-10.1, ignore atiixp_modem
module ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@222 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 10963822..ba203eb8 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>, 18-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 19-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # @@ -36,15 +36,21 @@ cp -a /etc/sysconfig/files/* /mnt 2>/dev/null & } # set greeting +len=$(expr length $DISTRO) +dstr="$DISTRO)" +while [ $len -le 8 ] ; do + dstr="$dstr " + len=$(expr $len + 1) +done echo " - WELCOME TO \n (\l) + WELCOME TO \n (\l) __ __ ___ __ __ __ __ __ __ | | | || | || | | || |_| | | | | | | || || | | | / |__| | |___ | || | || |_| | / _ __ |______||__||__| |__| _____/ |__| |__| |__| - Diskless Workstation (v4.0) (c) <dirk@goe.net> + Diskless Workstation (v4.0/$dstr (c) <dirk@goe.net> ">/mnt/etc/issue ####################################################################### @@ -319,7 +325,7 @@ if [ "x$start_x" != "xno" ] ; then /tmp/.X11-unix ; do testmkd /mnt/$i; done chmod a+rwxt /mnt/tmp/.ICE-unix chmod a+rwxt /mnt/tmp/.X11-unix - echo "" > /mnt/etc/X11/xdm/Xservers + echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers # define additional sessions offered to the user (via dhcp/ldap config) # descsession -> deprecated by new vmware integration concept # write available X display manager to /etc/X11/xdm/Xaccess @@ -358,18 +364,25 @@ $0: $date\n:0 local /usr/X11R6/bin/X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers xdmcp="true" ;; *) - # fixme!! not optimal for fast start # no display manager needed in kiosk mode # in this mode you have to provide the type of X session to start [ x$start_xdmcp != "x" ] || start_xdmcp="no"; - init="#7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7" + init="7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7" echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: \ -$date\nresmgr login nobody tty7\nresmgr grant nobody desktop\n\ -chown nobody /dev/dsp*\n\ -su -c 'xinit /etc/init.d/startgui $start_x -- vt7 -quiet' -l nobody &>/dev/null\n\ +$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 +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" \ >/mnt/var/X11R6/bin/kiosk - chmod a+x /mnt/var/X11R6/bin/kiosk & + # early start + echo -e "\t# kiosk start added by $0\n\tsleep 4; \ +/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 ;; esac # enable runlevel 5 (X11 gui under SuSE linux) |