summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJonathan Bauer2014-06-13 14:58:41 +0200
committerJonathan Bauer2014-06-13 14:58:41 +0200
commitc2f6ae63c8b5b78ec8e885fb8a8d26bbd9887c70 (patch)
tree656ce567b508cf64395f359e966dbf2fad33ccb3 /server
parent[pam-fr] disable CIFS for now, as it breaks firefox for certain users... (diff)
downloadtm-scripts-c2f6ae63c8b5b78ec8e885fb8a8d26bbd9887c70.tar.gz
tm-scripts-c2f6ae63c8b5b78ec8e885fb8a8d26bbd9887c70.tar.xz
tm-scripts-c2f6ae63c8b5b78ec8e885fb8a8d26bbd9887c70.zip
v2 of quick fix for unity shell not starting.
Diffstat (limited to 'server')
-rwxr-xr-xserver/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz4
-rwxr-xr-xserver/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper4
-rw-r--r--server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop8
3 files changed, 4 insertions, 12 deletions
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