From 8840bd7dd082de3bfa1502443acbc84e4bcd3451 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 12 Jun 2014 17:03:54 +0200
Subject: unity fix. TODO: fix logout

---
 server/configs/freiburg/ubuntu-14.04-unity-fixes                  | 1 +
 server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix      | 1 -
 .../etc/xdg/autostart/unity-panel-service.desktop                 | 7 +++++++
 .../ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper    | 4 ++++
 .../ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop   | 8 ++++++++
 .../etc/xdg/autostart/unity-panel-service.desktop                 | 7 -------
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 120000 server/configs/freiburg/ubuntu-14.04-unity-fixes
 delete mode 120000 server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
 create mode 100644 server/modules/ubuntu-14.04-unity-fixes/etc/xdg/autostart/unity-panel-service.desktop
 create mode 100755 server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper
 create mode 100644 server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop
 delete mode 100644 server/modules/ubuntu-14.04-unity-panel-service-fix/etc/xdg/autostart/unity-panel-service.desktop

(limited to 'server')

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-fixes/etc/xdg/autostart/unity-panel-service.desktop b/server/modules/ubuntu-14.04-unity-fixes/etc/xdg/autostart/unity-panel-service.desktop
new file mode 100644
index 00000000..495f5e69
--- /dev/null
+++ b/server/modules/ubuntu-14.04-unity-fixes/etc/xdg/autostart/unity-panel-service.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Unity Panel Service
+Exec=/usr/lib/unity/unity-panel-service
+OnlyShowIn=Unity;
+NoDisplay=true
+AutostartCondition=GNOME3 if-session 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
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
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-panel-service-fix/etc/xdg/autostart/unity-panel-service.desktop
deleted file mode 100644
index 495f5e69..00000000
--- a/server/modules/ubuntu-14.04-unity-panel-service-fix/etc/xdg/autostart/unity-panel-service.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Unity Panel Service
-Exec=/usr/lib/unity/unity-panel-service
-OnlyShowIn=Unity;
-NoDisplay=true
-AutostartCondition=GNOME3 if-session ubuntu
-- 
cgit v1.2.3-55-g7522