summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJonathan Bauer2014-05-08 15:46:01 +0200
committerJonathan Bauer2014-05-08 15:46:01 +0200
commit6dfbad265bbb5fe29be4c321c0d5d366d30ea7ad (patch)
tree614ede718ae0790a2943495715de422508063dbe /server
parent[rfs-s31] remove vmxnet from REQUIRED_KERNEL_MODULES (diff)
parentenglishized kopt2mod :) (diff)
downloadtm-scripts-6dfbad265bbb5fe29be4c321c0d5d366d30ea7ad.tar.gz
tm-scripts-6dfbad265bbb5fe29be4c321c0d5d366d30ea7ad.tar.xz
tm-scripts-6dfbad265bbb5fe29be4c321c0d5d366d30ea7ad.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'server')
-rw-r--r--server/blacklists/desktop-sessions/no-dual-head2
l---------server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix1
2 files changed, 3 insertions, 0 deletions
diff --git a/server/blacklists/desktop-sessions/no-dual-head b/server/blacklists/desktop-sessions/no-dual-head
new file mode 100644
index 00000000..d82fcc62
--- /dev/null
+++ b/server/blacklists/desktop-sessions/no-dual-head
@@ -0,0 +1,2 @@
+- /usr/lib/unity-settings-daemon-1.0/libxrandr.so
+- /usr/lib/unity-settings-daemon-1.0/xrandr.gnome-settings-plugin
diff --git a/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
new file mode 120000
index 00000000..c7444165
--- /dev/null
+++ b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
@@ -0,0 +1 @@
+../../modules/ubuntu-14.04-unity-panel-service-fix \ No newline at end of file