Merge branch 'master' of openslx:openslx-ng/tm-scripts

10 files changed, 38 insertions, 105 deletions

diff --git a/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui b/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
new file mode 100644
index 00000000..012246ba
--- /dev/null
+++ b/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
@@ -0,0 +1,3 @@
+#!/bin/ash
+killall beamergui
+
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xreset b/remote/modules/kdm/data/etc/kde4/kdm/Xreset
deleted file mode 100755
index 64194a64..00000000
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xreset
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/ash
-# Xreset - run as root after session exits
-#
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
-
-# Reassign ownership of the console to root, this should disallow
-# assignment of console output to any random users's xterm. See Xstartup.
-#
-#chown root /dev/console
-#chmod 622 /dev/console
-
-# XDM configurations typically have sessreg here. KDM has it built-in.
-
-# Use common Xreset framework if it exist
-if [ -x /etc/X11/Xreset ] ; then
-   /etc/X11/Xreset
-fi
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xsession b/remote/modules/kdm/data/etc/kde4/kdm/Xsession
deleted file mode 100755
index 79d3a06d..00000000
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xsession
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/ash
-# Xsession - run as user
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
-
-session=$1
-
-# Note that the respective logout scripts are not sourced.
-case $SHELL in
-  */bash)
-    [ -z "$BASH" ] && exec $SHELL $0 "$@"
-    set +o posix
-    [ -f /etc/profile ] && . /etc/profile
-    if [ -f $HOME/.bash_profile ]; then
-      . $HOME/.bash_profile
-    elif [ -f $HOME/.bash_login ]; then
-      . $HOME/.bash_login
-    elif [ -f $HOME/.profile ]; then
-      . $HOME/.profile
-    fi
-    ;;
-  */zsh)
-    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
-    emulate -R zsh
-    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-    zhome=${ZDOTDIR:-$HOME}
-    # zshenv is always sourced automatically.
-    [ -f $zdir/zprofile ] && . $zdir/zprofile
-    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
-    [ -f $zdir/zlogin ] && . $zdir/zlogin
-    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
-    setopt shwordsplit noextendedglob
-    ;;
-  */csh|*/tcsh)
-    # [t]cshrc is always sourced automatically.
-    # Note that sourcing csh.login after .cshrc is non-standard.
-    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $xsess_tmp"
-    . $xsess_tmp
-    rm -f $xsess_tmp
-    ;;
-  *) # Plain sh, ksh, and anything we do not know.
-    [ -f /etc/profile ] && . /etc/profile
-    [ -f $HOME/.profile ] && . $HOME/.profile
-    ;;
-esac
-
-# invoke global X session script
-. /etc/X11/Xsession
-
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
deleted file mode 100755
index 14ebe761..00000000
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/ash
-# Xsetup - run as root before the login dialog appears
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
-
-#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &
-
-#/sbin/initctl -q emit login-session-start DISPLAY_MANAGER=kdm
-
-# Use common Xreset framework if it exist
-if [ -x /etc/X11/Xsetup ] ; then
-   /etc/X11/Xsetup
-fi
-
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xstartup b/remote/modules/kdm/data/etc/kde4/kdm/Xstartup
deleted file mode 100755
index 5ca1683b..00000000
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xstartup
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/ash
-# Xstartup - run as root before session starts
-
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
-
-if [ -e /etc/nologin ]; then
-  # always display the nologin message, if possible
-  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then
-    xmessage -file /etc/nologin -geometry 640x480
-  fi
-  if [ "$(id -u)" != "0" ] && \
-     ! grep -qs '^ignore-nologin' /etc/kde4/kdm/kdm.options; then
-    exit 1
-  fi
-fi
-
-#/sbin/initctl -q emit desktop-session-start DISPLAY_MANAGER=kdm USER=$USER
-
-# NOTE: The session is aborted if the last command returns non-zero.
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index 1b59915a..88139796 100644
--- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -33,13 +33,13 @@ SessionsDirs=/opt/openslx/xsessions
 
 # Session is executed to start the user's session (as the user)
 # "One of the keywords failsafe, default or custom, or a string to eval by a Bourne-compatible shell is passed as the first argument."
-Session=/etc/kde4/kdm/Xsession
+Session=/etc/X11/Xsession
 # Reset is run after a session terminates (as root)
-Reset=/etc/kde4/kdm/Xreset
+Reset=/etc/X11/Xreset
 # Setup is executed once before the greeter starts (as root)
-Setup=/etc/kde4/kdm/Xsetup
+Setup=/etc/X11/Xsetup
 # Startup is executed on successful authentication, before the session is opened (as root)
-Startup=/etc/kde4/kdm/Xstartup
+Startup=/etc/X11/Xstartup
 
 [Shutdown]
 AllowFifo=false
diff --git a/remote/modules/xorg/data/etc/X11/Xreset b/remote/modules/xorg/data/etc/X11/Xreset
index a77cf2c0..4ed680ce 100755
--- a/remote/modules/xorg/data/etc/X11/Xreset
+++ b/remote/modules/xorg/data/etc/X11/Xreset
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/ash
 #
 # /etc/X11/Xreset
 #
-# global Xreset file -- for use by display managers
+# Xreset - run as root after session exits
+#
 
-# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
 
 set -e
 
diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession
index dc64cf77..914dd2e8 100755
--- a/remote/modules/xorg/data/etc/X11/Xsession
+++ b/remote/modules/xorg/data/etc/X11/Xsession
@@ -1,4 +1,12 @@
 #!/bin/ash
+#
+# /etc/X11/Xsession
+#
+# Xsession is executed to start the user's session (as the user)
+# 
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
+
 
 #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.
 
diff --git a/remote/modules/xorg/data/etc/X11/Xsetup b/remote/modules/xorg/data/etc/X11/Xsetup
index f57fe3be..524f7d84 100755
--- a/remote/modules/xorg/data/etc/X11/Xsetup
+++ b/remote/modules/xorg/data/etc/X11/Xsetup
@@ -1,4 +1,11 @@
 #!/bin/ash
+#
+# /etc/X11/Xsetup
+#
+# Xsetup is executed once before the greeter starts (as root)
+# 
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
 
 SESSIONDIR="/etc/X11/Xsetup.d"
 
diff --git a/remote/modules/xorg/data/etc/X11/Xstartup b/remote/modules/xorg/data/etc/X11/Xstartup
new file mode 100755
index 00000000..5631fa65
--- /dev/null
+++ b/remote/modules/xorg/data/etc/X11/Xstartup
@@ -0,0 +1,12 @@
+#!/bin/ash
+#
+# /etc/X11/Xstartup
+#
+# Xstartup is executed on successful authentication, before the session is opened (as root)
+#
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" 
+
+
+
+