summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2013-09-18 16:09:11 +0200
committerSimon Rettberg2013-09-18 16:09:11 +0200
commit3ed3c46108f89cdc436fe1b7a54cf9046639bab1 (patch)
tree303607bafb5c3000394a8365fe2ded5b6e3dc30b
parent[setup_target] Actually CHECK IF A REQUIRED LIBRARY IS THERE! (diff)
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-3ed3c46108f89cdc436fe1b7a54cf9046639bab1.tar.gz
tm-scripts-3ed3c46108f89cdc436fe1b7a54cf9046639bab1.tar.xz
tm-scripts-3ed3c46108f89cdc436fe1b7a54cf9046639bab1.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
-rw-r--r--server/blacklists/desktop-sessions/gnome/gnome-base4
-rw-r--r--server/blacklists/essential/linux-extended1
2 files changed, 4 insertions, 1 deletions
diff --git a/server/blacklists/desktop-sessions/gnome/gnome-base b/server/blacklists/desktop-sessions/gnome/gnome-base
index fd7b73d7..b5e25eee 100644
--- a/server/blacklists/desktop-sessions/gnome/gnome-base
+++ b/server/blacklists/desktop-sessions/gnome/gnome-base
@@ -40,7 +40,9 @@
# gnome seems to need accountdaemon for screensaver login
# (if not found 30sec timeout)
-# + /usr/lib/systemd/system/accounts-daemon.service
++ /usr/lib/systemd/
++ /usr/lib/systemd/system/
++ /usr/lib/systemd/system/accounts-daemon.service
# Suse version:
+ /usr/lib/accounts-daemon
# Ubuntu version:
diff --git a/server/blacklists/essential/linux-extended b/server/blacklists/essential/linux-extended
index ab39fda0..54f500ed 100644
--- a/server/blacklists/essential/linux-extended
+++ b/server/blacklists/essential/linux-extended
@@ -8,6 +8,7 @@
- /usr/share/upstart
- /lib/systemd
- /usr/lib/systemd
+- /usr/lib/systemd/**
- /etc/systemd
- /var/lib/NetworkManager