summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorManuel Schneider2013-10-24 12:38:39 +0200
committerManuel Schneider2013-10-24 12:38:39 +0200
commit46521c0413dc1cfac21f91b8c8bac27c755b74ca (patch)
tree1544159b592934ab73315b8df79076503e134c1a /server
parent[cups] Does not retry failed jobs anymore. (diff)
parent[printergui] Starts now tcpsvd and lpd directly (not via busybox). (diff)
downloadtm-scripts-46521c0413dc1cfac21f91b8c8bac27c755b74ca.tar.gz
tm-scripts-46521c0413dc1cfac21f91b8c8bac27c755b74ca.tar.xz
tm-scripts-46521c0413dc1cfac21f91b8c8bac27c755b74ca.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'server')
-rw-r--r--server/blacklists/essential/linux-extended8
1 files changed, 7 insertions, 1 deletions
diff --git a/server/blacklists/essential/linux-extended b/server/blacklists/essential/linux-extended
index 54f500ed..8cf0c95a 100644
--- a/server/blacklists/essential/linux-extended
+++ b/server/blacklists/essential/linux-extended
@@ -11,4 +11,10 @@
- /usr/lib/systemd/**
- /etc/systemd
- /var/lib/NetworkManager
-
+# blacklist busybox from system, to force the use of our own
+- /bin/busybox
+- /sbin/busybox
+- /usr/bin/busybox
+- /usr/sbin/busybox
+- /usr/local/bin/busybox
+- /usr/local/sbin/busybox