diff options
| author | Manuel Schneider | 2013-12-02 19:19:26 +0100 |
|---|---|---|
| committer | Manuel Schneider | 2013-12-02 19:19:26 +0100 |
| commit | f8a146d746b7d61fc8e1bf2eb97e448ca47a857a (patch) | |
| tree | 0b736e1698069de2dc442931de529f1ccd40f9a8 /server | |
| parent | xmodesetter (diff) | |
| parent | [xorg] Support /etc/X11/Xsession.d (diff) | |
| download | tm-scripts-f8a146d746b7d61fc8e1bf2eb97e448ca47a857a.tar.gz tm-scripts-f8a146d746b7d61fc8e1bf2eb97e448ca47a857a.tar.xz tm-scripts-f8a146d746b7d61fc8e1bf2eb97e448ca47a857a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'server')
| -rw-r--r-- | server/blacklists/essential/x11 | 3 | ||||
| -rw-r--r-- | server/blacklists/vmware/vmplayer | 4 | ||||
| -rw-r--r-- | server/blacklists/vmware/vmtools (renamed from server/blacklists/quickfix/vmware-tools) | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/server/blacklists/essential/x11 b/server/blacklists/essential/x11 new file mode 100644 index 00000000..9b487603 --- /dev/null +++ b/server/blacklists/essential/x11 @@ -0,0 +1,3 @@ +- /etc/X11 +- /etc/kde4/kdm + diff --git a/server/blacklists/vmware/vmplayer b/server/blacklists/vmware/vmplayer new file mode 100644 index 00000000..a4e487b5 --- /dev/null +++ b/server/blacklists/vmware/vmplayer @@ -0,0 +1,4 @@ +# don't use the vmware wrapper script to start the player +# as it won't work on our system. +- /usr/bin/vmplayer +- /usr/bin/vmware diff --git a/server/blacklists/quickfix/vmware-tools b/server/blacklists/vmware/vmtools index f6dd61cc..d53249a9 100644 --- a/server/blacklists/quickfix/vmware-tools +++ b/server/blacklists/vmware/vmtools @@ -1,3 +1,2 @@ # TODO: Make vmware-tools work properly in our system - /usr/lib/vmware-tools - |