From acabdcf147f691f1dc647e42abbaf60757b16a8d Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 2 Dec 2013 16:00:47 +0100
Subject: [doc] setup_howto: Minor changes

---
 doc/setup_howto | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/setup_howto b/doc/setup_howto
index 5d516ea9..29056829 100644
--- a/doc/setup_howto
+++ b/doc/setup_howto
@@ -19,7 +19,9 @@ scripts, as e.g. needed packages will be installed automatically.
 2. Source repositories
 
 openSLX main repository: git://git.openslx.org/openslx-ng/tm-scripts.git
-printerGUI repository: git://git.openslx.org/openslx-ng/printergui.git
+
+There are some other git repositories needed by the build process, but they
+will be automatically checked out, e.g. busybox or printergui.
 
 
 3. Server prerequisites
@@ -31,7 +33,9 @@ Needed services: dhcp, tftpd, httpd, NFS and/or dnbd3.
 
 checkout openSLX git repository:
 # git clone git://git.openslx.org/openslx-ng/tm-scripts.git
-# git clone git://git.openslx.org/openslx-ng/printergui.git
+
+There are some other git repositories needed by the build process, but they
+are automatically checked out, e.g. busybox or printergui.
 
 
 5. Getting started
@@ -208,8 +212,9 @@ localizations may be listed at [path to tm-scripts]/server/configs.
 
 10. iPXE: TODO
 
-## most probably not required as relevant features are available in recent
-## Syslinux versions (6.0.0+)
+This will be most probably not being required in the future, as relevant 
+features are available in recent Syslinux versions (6.0.0+).
+
 
 11. Stage 4 (extract Linux desktop environment)
 
-- 
cgit v1.2.3-55-g7522


From ece7bf09eb3fbb113bab1a6650dcb052480d5117 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 16:10:46 +0100
Subject: [vmchooser] run-virt: busybox sort compatibility

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 7e2eb5c5..6b9c4f0f 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -485,8 +485,8 @@ else
 fi
 
 if [ -z "$vm_diskfile" ]; then
-	new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | sort --version-sort | tail -1)
-	[ -n "$new_vmpath" ] && vmpath="$new_vmpath"
+	new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1)
+	[ -n "$new_vmpath" ] && vmpath="$vmpath$new_vmpath"
 	vm_diskfile="$vmpath"
 fi
 
-- 
cgit v1.2.3-55-g7522


From f444b0b058e17187a353b9db4e823f6020a0be6e Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 16:57:25 +0100
Subject: [rootfs-stage32] hello umount from system

---
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 357d9fce..ab2ac4cc 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -11,6 +11,7 @@ REQUIRED_BINARIES="
 	login
 	sulogin
 	mount
+	umount
 	mount.nfs4
 	umount.nfs4
 	mkfs.xfs
-- 
cgit v1.2.3-55-g7522


From 375a05f32f65fdc1671b6eb4b553c4526c0ada53 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 16:59:42 +0100
Subject: [pam] lazy umount home directories

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
index 7c533405..d3b5ebb3 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
@@ -26,10 +26,10 @@ if [ "x${OPENSESSIONS}" == "x1" ]; then
 	pkill -9 -u "${PAM_USER}" 
 
 	# unmount the home directory structure
-	umount "/home/${PAM_USER}/PERSISTENT" || \
+	umount -l "/home/${PAM_USER}/PERSISTENT" || \
 		echo "Could not unmount '/home/${PAM_USER}/PERSISTENT'."
         
-	umount "/home/${PAM_USER}" || \
+	umount -l "/home/${PAM_USER}" || \
 		echo "Could not unmount '/home/${PAM_USER}'."
 fi
 
-- 
cgit v1.2.3-55-g7522


From eec5a2f1c266bd3eb8cce673d417d5915f1fdc8e Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:00:16 +0100
Subject: [vmware] Xreset minor fix

---
 remote/modules/vmware/data/etc/X11/Xreset.d/vmware | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote/modules/vmware/data/etc/X11/Xreset.d/vmware b/remote/modules/vmware/data/etc/X11/Xreset.d/vmware
index c453aafd..ee436292 100644
--- a/remote/modules/vmware/data/etc/X11/Xreset.d/vmware
+++ b/remote/modules/vmware/data/etc/X11/Xreset.d/vmware
@@ -4,7 +4,7 @@
 
 VMWARE_TMP_DIRS="$(cat /proc/mounts | grep "/tmp/vmware-" | awk -F " " '{print $1}')"
 for DIR in $VMWARE_TMP_DIRS; do
-	umount -l $DIR || echo "could not unmount."
+	umount -l "$DIR" || echo "Could not unmount."
 done
 
 exit 0
-- 
cgit v1.2.3-55-g7522


From cb9d97cf8ddaf86d140d38f314180222f2616846 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 17:05:59 +0100
Subject: [pam] More warnings for user if homedir is not available

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 63fb3413..af9d059e 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -43,6 +43,12 @@ cat > "${PERSISTENT_HOME_DIR}/WARNING.txt" << EOF
 Your home directory contents is unavailable.
 DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT!
 EOF
+# Try to get the user's attention (probably unsuccessful anyways)
+for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do
+	for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do
+		ln -s "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
+	done
+done
 
 chown -R "${PAM_USER}" "${PERSISTENT_HOME_DIR}" || \
 	{ slxlog "pam-global-chpersistent " "Could not chown '${PERSISTENT_HOME_DIR}' to '${PAM_USER}'."; exit 1; }
-- 
cgit v1.2.3-55-g7522


From ff7c7b834e750d4e0bed1aa87e39b20070acada5 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:08:18 +0100
Subject: [pam] unneeded chmod

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 63fb3413..7c752641 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -19,8 +19,6 @@ mount | grep -q "$TEMP_HOME_DIR" && exit 0
 # no home, lets create it
 mkdir -p "${TEMP_HOME_DIR}" || \
 	{ slxlog "pam-global-mktemphome" "Could not create '${TEMP_HOME_DIR}'."; exit 1; }
-chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \
-	{ slxlog "pam-global-chtemphome" "Could not chown '${TEMP_HOME_DIR}' to ${PAM_USER}."; exit 1; }
 
 # now make it a tmpfs
 mount -t tmpfs -o size=100m tmpfs "${TEMP_HOME_DIR}" || \
@@ -44,7 +42,7 @@ Your home directory contents is unavailable.
 DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT!
 EOF
 
-chown -R "${PAM_USER}" "${PERSISTENT_HOME_DIR}" || \
+chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \
 	{ slxlog "pam-global-chpersistent " "Could not chown '${PERSISTENT_HOME_DIR}' to '${PAM_USER}'."; exit 1; }
 
 # now lets see if we have a persistent directory
-- 
cgit v1.2.3-55-g7522


From 711525844cbdf4f3fea000932b4d2acbf9ea0933 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:13:27 +0100
Subject: [pam] fix slxlog msg

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 881d5be0..0774775b 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -49,7 +49,7 @@ for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do
 done
 
 chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \
-	{ slxlog "pam-global-chpersistent " "Could not chown '${PERSISTENT_HOME_DIR}' to '${PAM_USER}'."; exit 1; }
+	{ slxlog "pam-global-chpersistent " "Could not chown '${TEMP_HOME_DIR}' to '${PAM_USER}'."; exit 1; }
 
 # now lets see if we have a persistent directory
 [ ! -e "${PERSISTENT_MOUNT_SCRIPT}" ] && exit 0
-- 
cgit v1.2.3-55-g7522


From 6642a0a4ddb504d20834d43ddccd111180549bb4 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:14:24 +0100
Subject: [blacklist] vmware 'module'

---
 server/blacklists/vmware/vmplayer | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 server/blacklists/vmware/vmplayer

diff --git a/server/blacklists/vmware/vmplayer b/server/blacklists/vmware/vmplayer
new file mode 100644
index 00000000..a4e487b5
--- /dev/null
+++ b/server/blacklists/vmware/vmplayer
@@ -0,0 +1,4 @@
+# don't use the vmware wrapper script to start the player
+# as it won't work on our system.
+- /usr/bin/vmplayer
+- /usr/bin/vmware
-- 
cgit v1.2.3-55-g7522


From 4732db45c6db933890b01396c6d8aa19f8006a85 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:15:18 +0100
Subject: [vmware] added Xreset to process the Xreset.d directory :)

---
 remote/modules/vmware/data/etc/X11/Xreset | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 remote/modules/vmware/data/etc/X11/Xreset

diff --git a/remote/modules/vmware/data/etc/X11/Xreset b/remote/modules/vmware/data/etc/X11/Xreset
new file mode 100755
index 00000000..7a0974cf
--- /dev/null
+++ b/remote/modules/vmware/data/etc/X11/Xreset
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# /etc/X11/Xreset
+#
+# global Xreset file -- for use by display managers
+
+# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
+
+set -e
+
+PROGNAME=Xreset
+SYSSESSIONDIR=/etc/X11/Xreset.d
+
+if [ ! -d "$SYSSESSIONDIR" ]; then
+  # Nothing to do, exiting
+  exit 0
+fi
+
+# use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other
+SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+if [ -n "$SESSIONFILES" ]; then
+  set +e
+  for SESSIONFILE in $SESSIONFILES; do
+    . $SESSIONFILE
+  done
+  set -e
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
-- 
cgit v1.2.3-55-g7522


From ecefb46cdd70f046cfd8eab844141640d1f55a35 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 17:17:39 +0100
Subject: <blacklist stage4> add X11 scripts to blacklist

---
 server/blacklists/essential/x11 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 server/blacklists/essential/x11

diff --git a/server/blacklists/essential/x11 b/server/blacklists/essential/x11
new file mode 100644
index 00000000..9b487603
--- /dev/null
+++ b/server/blacklists/essential/x11
@@ -0,0 +1,3 @@
+- /etc/X11
+- /etc/kde4/kdm
+
-- 
cgit v1.2.3-55-g7522


From 1f7926fff0737cd0517117d85d27db6219fd754d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:21:58 +0100
Subject: [xorg] moved Xreset script to xorg module. And make it actually
 working.

---
 remote/modules/vmware/data/etc/X11/Xreset | 34 -------------------------------
 remote/modules/xorg/data/etc/X11/Xreset   | 24 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 34 deletions(-)
 delete mode 100755 remote/modules/vmware/data/etc/X11/Xreset
 create mode 100755 remote/modules/xorg/data/etc/X11/Xreset

diff --git a/remote/modules/vmware/data/etc/X11/Xreset b/remote/modules/vmware/data/etc/X11/Xreset
deleted file mode 100755
index 7a0974cf..00000000
--- a/remote/modules/vmware/data/etc/X11/Xreset
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/Xreset
-#
-# global Xreset file -- for use by display managers
-
-# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
-
-set -e
-
-PROGNAME=Xreset
-SYSSESSIONDIR=/etc/X11/Xreset.d
-
-if [ ! -d "$SYSSESSIONDIR" ]; then
-  # Nothing to do, exiting
-  exit 0
-fi
-
-# use run-parts to source every file in the session directory; we source
-# instead of executing so that the variables and functions defined above
-# are available to the scripts, and so that they can pass variables to each
-# other
-SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
-if [ -n "$SESSIONFILES" ]; then
-  set +e
-  for SESSIONFILE in $SESSIONFILES; do
-    . $SESSIONFILE
-  done
-  set -e
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/remote/modules/xorg/data/etc/X11/Xreset b/remote/modules/xorg/data/etc/X11/Xreset
new file mode 100755
index 00000000..a77cf2c0
--- /dev/null
+++ b/remote/modules/xorg/data/etc/X11/Xreset
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# /etc/X11/Xreset
+#
+# global Xreset file -- for use by display managers
+
+# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
+
+set -e
+
+PROGNAME=Xreset
+SYSSESSIONDIR=/etc/X11/Xreset.d
+
+if [ ! -d "$SYSSESSIONDIR" ]; then
+  # Nothing to do, exiting
+  exit 0
+fi
+
+for SESSIONFILE in $SYSSESSIONDIR/*; do
+	. "$SESSIONFILE" || slxlog "xreset" "Xreset: Could not source $SESSIONFILE." "$SESSIONFILE" 
+done
+
+exit 0
+
-- 
cgit v1.2.3-55-g7522


From f107163320c409f99c750ba67fbdb6389b456525 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:23:49 +0100
Subject: [blacklist stage4] moved vmware-tools blacklist entry to vmware
 directory

---
 server/blacklists/quickfix/vmware-tools | 3 ---
 server/blacklists/vmware/vmtools        | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 server/blacklists/quickfix/vmware-tools
 create mode 100644 server/blacklists/vmware/vmtools

diff --git a/server/blacklists/quickfix/vmware-tools b/server/blacklists/quickfix/vmware-tools
deleted file mode 100644
index f6dd61cc..00000000
--- a/server/blacklists/quickfix/vmware-tools
+++ /dev/null
@@ -1,3 +0,0 @@
-# TODO: Make vmware-tools work properly in our system
-- /usr/lib/vmware-tools
-
diff --git a/server/blacklists/vmware/vmtools b/server/blacklists/vmware/vmtools
new file mode 100644
index 00000000..d53249a9
--- /dev/null
+++ b/server/blacklists/vmware/vmtools
@@ -0,0 +1,2 @@
+# TODO: Make vmware-tools work properly in our system
+- /usr/lib/vmware-tools
-- 
cgit v1.2.3-55-g7522


From ec2b773aaa825e55c7aaff290aa819b0084a977a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 17:37:35 +0100
Subject: [pam] Fix link, make it relative

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 0774775b..c0195eeb 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -44,7 +44,7 @@ EOF
 # Try to get the user's attention (probably unsuccessful anyways)
 for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do
 	for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do
-		ln -s "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
+		ln -s "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
 	done
 done
 
-- 
cgit v1.2.3-55-g7522


From e977658ed9d2ed26e20c9a8d81712a95801487bf Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Dec 2013 17:48:48 +0100
Subject: [kdm] Fix le path dans les Xorg scripts

---
 remote/modules/kdm/data/etc/kde4/kdm/Xreset   | 6 ++++--
 remote/modules/kdm/data/etc/kde4/kdm/Xsession | 3 ++-
 remote/modules/kdm/data/etc/kde4/kdm/Xsetup   | 3 ++-
 remote/modules/kdm/data/etc/kde4/kdm/Xstartup | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xreset b/remote/modules/kdm/data/etc/kde4/kdm/Xreset
index e6782a43..64194a64 100755
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xreset
+++ b/remote/modules/kdm/data/etc/kde4/kdm/Xreset
@@ -1,5 +1,7 @@
-#! /bin/sh
+#! /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.
@@ -12,4 +14,4 @@
 # Use common Xreset framework if it exist
 if [ -x /etc/X11/Xreset ] ; then
    /etc/X11/Xreset
-fi
\ No newline at end of file
+fi
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xsession b/remote/modules/kdm/data/etc/kde4/kdm/Xsession
index edff71a3..79d3a06d 100755
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xsession
+++ b/remote/modules/kdm/data/etc/kde4/kdm/Xsession
@@ -1,5 +1,6 @@
-#! /bin/sh
+#! /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
 
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
index a31d61e4..965f1f08 100755
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
+++ b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
@@ -1,5 +1,6 @@
-#! /bin/sh
+#! /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 &
 
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xstartup b/remote/modules/kdm/data/etc/kde4/kdm/Xstartup
index c5439011..5ca1683b 100755
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xstartup
+++ b/remote/modules/kdm/data/etc/kde4/kdm/Xstartup
@@ -1,7 +1,7 @@
-#! /bin/sh
+#! /bin/ash
 # Xstartup - run as root before session starts
 
-PATH="$PATH:/usr/bin/X11"
+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
-- 
cgit v1.2.3-55-g7522


From bc31ea71fe77bc9e0e448df0caa6d1d92807a912 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 18:03:30 +0100
Subject: [pam] Warnings need to be hard links as vmware/windows chokes on
 symlinks

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index c0195eeb..6b46ca0d 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -42,9 +42,9 @@ Your home directory contents is unavailable.
 DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT!
 EOF
 # Try to get the user's attention (probably unsuccessful anyways)
-for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do
-	for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do
-		ln -s "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
+for ext in doc xls ppt odt; do
+	for fname in WARNING ACHTUNG ATTENTION; do
+		ln "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
 	done
 done
 
-- 
cgit v1.2.3-55-g7522


From 35d95372798a1ba59b5e303b668750411e1bfec6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 18:27:03 +0100
Subject: -

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 6b46ca0d..8533f421 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -44,7 +44,7 @@ EOF
 # Try to get the user's attention (probably unsuccessful anyways)
 for ext in doc xls ppt odt; do
 	for fname in WARNING ACHTUNG ATTENTION; do
-		ln "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
+		ln "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
 	done
 done
 
-- 
cgit v1.2.3-55-g7522


From 9b422d52541dcf9dc34b3c971679e343c549118d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Dec 2013 18:56:57 +0100
Subject: [xorg] Support /etc/X11/Xsession.d

---
 remote/modules/xorg/data/etc/X11/Xsession | 8 ++++++++
 1 file changed, 8 insertions(+)
 mode change 100644 => 100755 remote/modules/xorg/data/etc/X11/Xsession

diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession
old mode 100644
new mode 100755
index 15867190..dc64cf77
--- a/remote/modules/xorg/data/etc/X11/Xsession
+++ b/remote/modules/xorg/data/etc/X11/Xsession
@@ -2,6 +2,14 @@
 
 #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.
 
+SESSIONDIR="/etc/X11/Xsession.d"
+
+if [ -d "$SESSIONDIR" ]; then
+	for file in $SESSIONDIR/*; do
+		. $file || slxlog "xsession" "Xsession: Could not source $file" "$file"
+	done
+fi
+
 #start selected session
 case "$1" in
 	failsafe)
-- 
cgit v1.2.3-55-g7522