From 40d4ef0dfb1487b599973f14b89fc80c2dc2cfdf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 21 Nov 2013 17:29:31 +0100
Subject: [stage4-blacklist] Remove links to shell, poweroff/reboot/shutdown,
 whitelist xfce desktop environment

---
 server/blacklists/desktop-sessions/filter | 1 +
 server/blacklists/essential/linux-base    | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'server/blacklists')

diff --git a/server/blacklists/desktop-sessions/filter b/server/blacklists/desktop-sessions/filter
index 66d3589a..aafd1156 100644
--- a/server/blacklists/desktop-sessions/filter
+++ b/server/blacklists/desktop-sessions/filter
@@ -2,3 +2,4 @@
 + /usr/share/xsessions/gnome.desktop
 + /usr/share/xsessions/kde-plasma.desktop
 + /usr/share/xsessions/ubuntu.desktop
++ /usr/share/xsessions/xfce.desktop
diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base
index 4f58b6c9..f83ef1ac 100644
--- a/server/blacklists/essential/linux-base
+++ b/server/blacklists/essential/linux-base
@@ -32,5 +32,11 @@
 - /initrd.img.old
 - /vmlinuz
 - /vmlinuz.old
+# Interfering binaries/links
+- /sbin/shutdown
+- /sbin/reboot
+- /sbin/poweroff
+- /sbin/halt
+- /bin/sh
 # This is where the bind-mount of mltk resides...
 - /export/build
-- 
cgit v1.2.3-55-g7522