summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJonathan Bauer2014-05-02 13:14:34 +0200
committerJonathan Bauer2014-05-02 13:14:34 +0200
commitbfcf2c3545411104b8c6303f32312570e9b7c72c (patch)
tree5acbca62eb66c55d9375600e973fbae9fe8fbcdf /server
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-bfcf2c3545411104b8c6303f32312570e9b7c72c.tar.gz
tm-scripts-bfcf2c3545411104b8c6303f32312570e9b7c72c.tar.xz
tm-scripts-bfcf2c3545411104b8c6303f32312570e9b7c72c.zip
[stage4] added gnome-fallback session to stage4 whitelist
Diffstat (limited to 'server')
-rw-r--r--server/blacklists/desktop-sessions/filter10
1 files changed, 8 insertions, 2 deletions
diff --git a/server/blacklists/desktop-sessions/filter b/server/blacklists/desktop-sessions/filter
index aafd1156..9281a412 100644
--- a/server/blacklists/desktop-sessions/filter
+++ b/server/blacklists/desktop-sessions/filter
@@ -1,5 +1,11 @@
- /usr/share/xsessions/*
-+ /usr/share/xsessions/gnome.desktop
-+ /usr/share/xsessions/kde-plasma.desktop
+ /usr/share/xsessions/ubuntu.desktop
+ /usr/share/xsessions/xfce.desktop
+
+# TODO: until gnome-shell conflicts with unity gets fixed
+# for ubuntu 14.04, filter it.
+# + /usr/share/xsessions/gnome.desktop
+
+# gnome-session-fallback for the good ol' gnome2 session
++ /usr/share/xsessions/gnome-fallback.desktop
++ /usr/share/xsessions/kde-plasma.desktop