diff options
| author | Simon Rettberg | 2014-05-04 13:40:52 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-05-04 13:40:52 +0200 |
| commit | 5afb2d14c421d35c01358ae8c78af1cba41ee086 (patch) | |
| tree | 920b4e2f339f1e4ba40a7a9f8ddec538e6b3248a /server | |
| parent | [vmchooser2] ! (diff) | |
| parent | [stage4] rename gnome-session-fallback to "GNOME" for vmchooser (diff) | |
| download | tm-scripts-5afb2d14c421d35c01358ae8c78af1cba41ee086.tar.gz tm-scripts-5afb2d14c421d35c01358ae8c78af1cba41ee086.tar.xz tm-scripts-5afb2d14c421d35c01358ae8c78af1cba41ee086.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'server')
| -rw-r--r-- | server/blacklists/desktop-sessions/filter | 10 | ||||
| -rw-r--r-- | server/blacklists/desktop-sessions/unity/unity-apps | 2 |
2 files changed, 10 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 diff --git a/server/blacklists/desktop-sessions/unity/unity-apps b/server/blacklists/desktop-sessions/unity/unity-apps new file mode 100644 index 00000000..1f68f3c9 --- /dev/null +++ b/server/blacklists/desktop-sessions/unity/unity-apps @@ -0,0 +1,2 @@ +- /usr/share/applications/ubuntu-software-center.desktop +- /usr/share/applications/ubuntu-amazon-default.desktop |