From 20174f45cbe71f60a856e28e230fe3a427bb5268 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 13 Jun 2014 14:57:11 +0200
Subject: [pam-fr] disable CIFS for now, as it breaks firefox for certain
 users...

---
 .../pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
index 464dcd9f..e2618588 100644
--- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
+++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
@@ -16,7 +16,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then
 
 	CIFS_VOLUME=$(cat /tmp/ldapsearch.${PAM_USER} | grep rufHomepath | cut -d" " -f2 | tr '\\' '/')
 
-	if [ ! -z "${CIFS_VOLUME}" ]; then
+	# TODO: fix CIFS mount. Currently breaks certain file operations, e.g. firefox's sqlite files
+	if false; then
+	#if [ ! -z "${CIFS_VOLUME}" ]; then
 		# now we can mount the home directory!
 		MOUNT_OPTS="-t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,file_mode=0600,dir_mode=0700"
 		export USER="${PAM_USER}"
-- 
cgit v1.2.3-55-g7522


From c2f6ae63c8b5b78ec8e885fb8a8d26bbd9887c70 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 13 Jun 2014 14:58:41 +0200
Subject: v2 of quick fix for unity shell not starting.

---
 .../modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz | 4 ++++
 .../ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper    | 4 ----
 .../ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop   | 8 --------
 3 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100755 server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz
 delete mode 100755 server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper
 delete mode 100644 server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop

(limited to 'server')

diff --git a/server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz b/server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz
new file mode 100755
index 00000000..45cc71e8
--- /dev/null
+++ b/server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz
@@ -0,0 +1,4 @@
+#!/bin/ash
+
+touch /tmp/washereagain
+export COMPIZ_CONFIG_PROFILE='ubuntu'
diff --git a/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper b/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper
deleted file mode 100755
index 7500c147..00000000
--- a/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/ash
-
-gnome-session --session='ubuntu' &
-unity
diff --git a/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop b/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop
deleted file mode 100644
index 36ee49bc..00000000
--- a/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Ubuntu
-Comment=This session logs you into Ubuntu
-Exec=/opt/openslx/scripts/unity-wrapper
-Icon=
-Type=Application
-X-LightDM-DesktopName=Unity
-X-Ubuntu-Gettext-Domain=gnome-session-3.0
-- 
cgit v1.2.3-55-g7522