summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJonathan Bauer2014-06-12 17:03:54 +0200
committerJonathan Bauer2014-06-12 17:03:54 +0200
commit8840bd7dd082de3bfa1502443acbc84e4bcd3451 (patch)
tree67f67c89a8be4085e6e0c92efdaee65dbe05735a /server
parentthese french people .... (diff)
downloadtm-scripts-8840bd7dd082de3bfa1502443acbc84e4bcd3451.tar.gz
tm-scripts-8840bd7dd082de3bfa1502443acbc84e4bcd3451.tar.xz
tm-scripts-8840bd7dd082de3bfa1502443acbc84e4bcd3451.zip
unity fix. TODO: fix logout
Diffstat (limited to 'server')
l---------server/configs/freiburg/ubuntu-14.04-unity-fixes1
l---------server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix1
-rw-r--r--server/modules/ubuntu-14.04-unity-fixes/etc/xdg/autostart/unity-panel-service.desktop (renamed from server/modules/ubuntu-14.04-unity-panel-service-fix/etc/xdg/autostart/unity-panel-service.desktop)0
-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
5 files changed, 13 insertions, 1 deletions
diff --git a/server/configs/freiburg/ubuntu-14.04-unity-fixes b/server/configs/freiburg/ubuntu-14.04-unity-fixes
new file mode 120000
index 00000000..aa414c2e
--- /dev/null
+++ b/server/configs/freiburg/ubuntu-14.04-unity-fixes
@@ -0,0 +1 @@
+../../modules/ubuntu-14.04-unity-fixes \ No newline at end of file
diff --git a/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
deleted file mode 120000
index c7444165..00000000
--- a/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/ubuntu-14.04-unity-panel-service-fix \ No newline at end of file
diff --git a/server/modules/ubuntu-14.04-unity-panel-service-fix/etc/xdg/autostart/unity-panel-service.desktop b/server/modules/ubuntu-14.04-unity-fixes/etc/xdg/autostart/unity-panel-service.desktop
index 495f5e69..495f5e69 100644
--- a/server/modules/ubuntu-14.04-unity-panel-service-fix/etc/xdg/autostart/unity-panel-service.desktop
+++ b/server/modules/ubuntu-14.04-unity-fixes/etc/xdg/autostart/unity-panel-service.desktop
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
new file mode 100755
index 00000000..7500c147
--- /dev/null
+++ b/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 00000000..36ee49bc
--- /dev/null
+++ b/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop
@@ -0,0 +1,8 @@
+[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