summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2013-09-04 20:34:44 +0200
committerSimon Rettberg2013-09-04 20:34:44 +0200
commit242c56ad189e4ce71811bcfaecd4dea42bd4fc04 (patch)
treefab65b77c5e9e4a899d4c1b0e9f2db7d984b4ca0
parentMerge branch 'master' of simonslx:openslx-ng/tm-scripts (diff)
downloadtm-scripts-242c56ad189e4ce71811bcfaecd4dea42bd4fc04.tar.gz
tm-scripts-242c56ad189e4ce71811bcfaecd4dea42bd4fc04.tar.xz
tm-scripts-242c56ad189e4ce71811bcfaecd4dea42bd4fc04.zip
[SERVER] Update stage4 filter
-rw-r--r--server/blacklists/essential/console-kit8
-rw-r--r--server/blacklists/essential/dbus4
-rw-r--r--server/blacklists/essential/linux-extended1
-rw-r--r--server/blacklists/essential/policykit7
-rw-r--r--server/blacklists/x-autostart/xdg-autostart1
5 files changed, 6 insertions, 15 deletions
diff --git a/server/blacklists/essential/console-kit b/server/blacklists/essential/console-kit
deleted file mode 100644
index a176cac9..00000000
--- a/server/blacklists/essential/console-kit
+++ /dev/null
@@ -1,8 +0,0 @@
-# Consolekit is removed and replaced by a dummy in stage32
-- console-kit*
-- consolekit*
-- libck-connector*
-- *-ck-connector*
-- *Console-Kit*
-- *ConsoleKit*
-
diff --git a/server/blacklists/essential/dbus b/server/blacklists/essential/dbus
index 42afc286..f8748c13 100644
--- a/server/blacklists/essential/dbus
+++ b/server/blacklists/essential/dbus
@@ -35,7 +35,8 @@
- dbus-1**org.freedesktop.Geoclue.*
- dbus-1**org.gnome.zeitgeist.*
- dbus-1**unity-lens-shopping.service
-# systen-services
+- dbus-1**org.freedesktop.UPower.*
+# system-services
- dbus-1**fi.epitest.hostap.WPASupplicant.service
- dbus-1**fi.w1.wpa_supplicant1.service
- dbus-1**org.freedesktop.hostname1.service
@@ -44,4 +45,5 @@
- dbus-1**org.freedesktop.nm_dispatcher.service
- dbus-1**org.freedesktop.systemd1.service
- dbus-1**org.freedesktop.timedate1.service
+- dbus-1**org.freedesktop.UPower.service
diff --git a/server/blacklists/essential/linux-extended b/server/blacklists/essential/linux-extended
index d9d7ef97..ab39fda0 100644
--- a/server/blacklists/essential/linux-extended
+++ b/server/blacklists/essential/linux-extended
@@ -3,6 +3,7 @@
- /usr/src
- /etc/init.d
- /etc/init
+- /etc/cups
- /var/lib/init.d
- /usr/share/upstart
- /lib/systemd
diff --git a/server/blacklists/essential/policykit b/server/blacklists/essential/policykit
index 68ff5a44..c46a050a 100644
--- a/server/blacklists/essential/policykit
+++ b/server/blacklists/essential/policykit
@@ -1,7 +1,2 @@
-# Also get rid of polkit
-- libpolkit*
-- polkit*
-- policykit*
-- *PolicyKit*
-- *PolKit*
+- /usr/share/pol*/actions/org.freedesktop.upower.*
diff --git a/server/blacklists/x-autostart/xdg-autostart b/server/blacklists/x-autostart/xdg-autostart
index bd4dd467..64593d31 100644
--- a/server/blacklists/x-autostart/xdg-autostart
+++ b/server/blacklists/x-autostart/xdg-autostart
@@ -1,4 +1,5 @@
+ /etc/xdg/autostart/**/
+ /etc/xdg/autostart/gnome-settings-daemon.desktop
++ /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
- /etc/xdg/autostart/**