New kiosk mode. Now Sound seems to work, trick: cascade cammands with "&&". Sound is unmuted. stattgui removed all obsolete stuff.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1355 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 22 insertions, 41 deletions

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index c8f191ff..9ec03bea 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -537,15 +537,22 @@ $0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
       # 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"
-      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  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\
-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
+      echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: $date
+      while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null; do
+        test -f /var/run/kiosk || break; sleep 3;
+      done
+      touch /var/run/kiosk
+      resmgr login nobody tty7 \\
+      && resmgr grant nobody desktop \\
+      && chown -R nobody:nogroup /var/lib/nobody \\
+      && (su -c 'amixer -q sset Master 28 unmute
+        amixer -q sset PCM 28 unmute
+        xinit /var/X11R6/bin/startgui $start_x \\
+        -- vt7 -quiet' -l nobody &>/dev/null)
+      rm /var/run/kiosk
+      resmgr revoke nobody
+      resmgr logout tty7
+      killall X" >/mnt/var/X11R6/bin/kiosk
       # 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\
diff --git a/initramfs/initrd-stuff/etc/startgui b/initramfs/initrd-stuff/etc/startgui
index 4a475d0b..37955a23 100755
--- a/initramfs/initrd-stuff/etc/startgui
+++ b/initramfs/initrd-stuff/etc/startgui
@@ -3,67 +3,41 @@
 # Description: startgui runs as script replacement for xinit
 #
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 19-05-2006
-#		Michael Janczyk, 26-08-2005
-# Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
+#		Michael Janczyk, 28-09-2007
+# Copyright:    (c) 2003, 2007 - RZ Universitaet Freiburg
 #
-# Version:      0.1.0b
+# Version:      0.1.0c
 #
 # /var/X11R6/bin/startgui
 # 
 ###########################################################################
 
-# functions
-error () {
-	$2 $1
-}
-
-sysresources=/usr/X11R6/lib/X11/Xresources
-sysmodmap=/usr/X11R6/lib/X11/Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
 WM=$1
 [ $WM ] || WM=kde
 case "$WM" in
   *fvwm*)
-     fvwm2
+    fvwm2
   ;;
   *kde*)
-     mkdir ~/.kde &>/dev/null
-     cp -a /usr/share/dxs/WMsettings/kde ~/.kde
-    /opt/kde3/bin/startkde
+    startkde
   ;;
   *wmaker*|*windowmaker*)
-    mkdir ~/GNUstep &>/dev/null
-    cp -a /usr/share/dxs/WMsettings/windowmaker ~/GNUstep
     wmaker
   ;;
   *ice*)
     icewm
   ;;
   *gnome*)
-    cp -a /usr/share/dxs/WMsettings/gnome/.* ~/
     gnome
   ;;
   *citrix|Citrix|ICAClient|*wfica)
-    xsetroot -solid black
-    cp -a /etc/dxs/ICAClient/ ~/.ICAClient 
     wfica
   ;;
   *citrix-mgr|*citrix-indirect|*wfcmgr)
-    xsetroot -solid black
-    cp -a /etc/dxs/ICAClient/ ~/.ICAClient
     #
   ;;
   *vmware*)
-    xsetroot -solid black
-    mkdir -p $HOME/.vmware &>/dev/null
-    xterm -bg black -fg white -geometry 170x30+0-0 +sb -e \
-      "runvmware --xdm vm"
+    /var/X11R6/bin/xdialog.sh
   ;;
   *)
     if which $WM; then