summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Rößler2014-04-16 17:40:32 +0200
committerChristian Rößler2014-04-16 17:40:32 +0200
commite52ee9a030e3db53183f45910db4255436bb63d9 (patch)
tree735e04e7313bfeaab24eefc2eb294238296bd9d1
parent[openslx] Added example for initram-fs / cpio, stage31 (diff)
parent[nvidia_kernel] Newer driver version 337.12 doesn't seem to throw error build... (diff)
downloadtm-scripts-e52ee9a030e3db53183f45910db4255436bb63d9.tar.gz
tm-scripts-e52ee9a030e3db53183f45910db4255436bb63d9.tar.xz
tm-scripts-e52ee9a030e3db53183f45910db4255436bb63d9.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
-rw-r--r--remote/modules/nvidia_kernel/module.conf.ubuntu.14.044
-rw-r--r--server/blacklists/desktop-sessions/unity/unity-base1
2 files changed, 5 insertions, 0 deletions
diff --git a/remote/modules/nvidia_kernel/module.conf.ubuntu.14.04 b/remote/modules/nvidia_kernel/module.conf.ubuntu.14.04
new file mode 100644
index 00000000..73887357
--- /dev/null
+++ b/remote/modules/nvidia_kernel/module.conf.ubuntu.14.04
@@ -0,0 +1,4 @@
+REQUIRED_VERSION="337.12"
+REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
+REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
+
diff --git a/server/blacklists/desktop-sessions/unity/unity-base b/server/blacklists/desktop-sessions/unity/unity-base
index dd04f561..c93d45cc 100644
--- a/server/blacklists/desktop-sessions/unity/unity-base
+++ b/server/blacklists/desktop-sessions/unity/unity-base
@@ -3,3 +3,4 @@
+ /etc/xdg/autostart/unity-fallback-mount-helper.desktop
+ /etc/xdg/autostart/indicator-session.desktop
+ /etc/xdg/autostart/indicator-sound.desktop
++ /etc/xdg/autostart/indicator-datetime.desktop