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(-)

(limited to 'remote/modules/vmware/data')

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 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

(limited to 'remote/modules/vmware/data')

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 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

(limited to 'remote/modules/vmware/data')

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