From 2c6d450c58c66fa83acfdb4c453f332acdc31dc1 Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Wed, 21 Oct 2009 16:57:27 +0200
Subject: [PATCH] Added some scrubs in the tree scrubs template

---
 etc/tree/scrubs.i386           | 64 ++++++++++++++++++++++++++++++++++
 src/pylorax/_rewrite/scrubs.py | 18 ----------
 2 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/etc/tree/scrubs.i386 b/etc/tree/scrubs.i386
index df0647d3..e0205a90 100644
--- a/etc/tree/scrubs.i386
+++ b/etc/tree/scrubs.i386
@@ -37,3 +37,67 @@ remove @instroot@/var/preserve
 remove @instroot@/var/spool
 remove @instroot@/var/tmp
 remove @instroot@/var/yp
+
+# remove directories from /lib
+remove @instroot@/lib/i686
+remove @instroot@/lib/kbd
+remove @instroot@/lib/rtkaio
+remove @instroot@/lib/security
+remove @instroot@/lib/tls
+remove @instroot@/lib/xtables
+
+# remove directories from /etc
+remove @instroot@/etc/ConsoleKit
+remove @instroot@/etc/X11
+remove @instroot@/etc/alternatives
+remove @instroot@/etc/asterisk
+remove @instroot@/etc/avahi
+remove @instroot@/etc/blkid
+remove @instroot@/etc/bonobo*
+remove @instroot@/etc/chkconfig*
+remove @instroot@/etc/cron.*
+remove @instroot@/etc/default
+remove @instroot@/etc/depmod.d
+remove @instroot@/etc/dirmngr
+remove @instroot@/etc/dnsmasq.d
+remove @instroot@/etc/event.d
+remove @instroot@/etc/firmware
+remove @instroot@/etc/firstaidkit
+remove @instroot@/etc/gconf
+remove @instroot@/etc/gcrypt
+remove @instroot@/etc/gnome-vfs*
+remove @instroot@/etc/gnupg
+remove @instroot@/etc/gtk
+remove @instroot@/etc/hotplug
+remove @instroot@/etc/init.d
+remove @instroot@/etc/iproute2
+remove @instroot@/etc/iscsi
+remove @instroot@/etc/kernel
+remove @instroot@/etc/ld.so.conf.d
+remove @instroot@/etc/logrotate.d
+remove @instroot@/etc/lvm
+remove @instroot@/etc/makedev.d
+remove @instroot@/etc/modprobe.d
+remove @instroot@/etc/netplug*
+remove @instroot@/etc/ntp
+remove @instroot@/etc/openldap
+remove @instroot@/etc/opt
+remove @instroot@/etc/pam.d
+remove @instroot@/etc/pki
+remove @instroot@/etc/pm
+remove @instroot@/etc/popt.d
+remove @instroot@/etc/ppp
+remove @instroot@/etc/prelink.conf.d
+remove @instroot@/etc/profile.d
+remove @instroot@/etc/rc?.d
+remove @instroot@/etc/rwtab.d
+remove @instroot@/etc/samba
+remove @instroot@/etc/sasl2
+remove @instroot@/etc/security
+remove @instroot@/etc/setuptool.d
+remove @instroot@/etc/skel
+remove @instroot@/etc/ssh
+remove @instroot@/etc/statetab.d
+remove @instroot@/etc/terminfo
+remove @instroot@/etc/xdg
+remove @instroot@/etc/xinetd.d
diff --git a/src/pylorax/_rewrite/scrubs.py b/src/pylorax/_rewrite/scrubs.py
index 8f6eda3c..af4d9f04 100644
--- a/src/pylorax/_rewrite/scrubs.py
+++ b/src/pylorax/_rewrite/scrubs.py
@@ -84,20 +84,6 @@ class Install(object):
         for dir in dirs:
             rm(os.path.join(self.conf.treedir, 'usr', 'share', 'themes', dir))
 
-        # remove dirs from etc
-        dirs = ('ConsoleKit', 'X11', 'alternatives', 'asterisk', 'avahi', 'blkid', 'bonobo-activation', 'chkconfig.d', 'cron.*', 'default', 'depmod.d',
-                'dirmngr', 'dnsmasq.d', 'event.d', 'firmware', 'firstaidkit', 'gconf', 'gcrypt', 'gnome-vfs*', 'gnupg', 'gtk', 'hotplug', 'init.d',
-                'iproute2', 'iscsi', 'kernel', 'ld.so.conf.d', 'logrotate.d', 'lvm', 'makedev.d', 'modprobe.d', 'netplug*', 'ntp', 'openldap', 'opt',
-                'pam.d', 'pki', 'pm', 'popt.d', 'ppp', 'prelink.conf.d', 'profile.d', 'rc[0-6].d', 'rwtab.d', 'samba', 'sasl2', 'security', 'setuptool.d',
-                'skel', 'ssh', 'statetab.d', 'terminfo', 'xdg', 'xinetd.d', 'yum.repos.d')
-        for dir in dirs:
-            rm(os.path.join(self.conf.treedir, 'etc', dir))
-
-        # remove dirs from lib
-        dirs = ('i686', 'kbd', 'rtkaio', 'security', 'tls', 'xtables')
-        for dir in dirs:
-            rm(os.path.join(self.conf.treedir, 'lib', dir))
-
         # remove dirs from usr/libexec
         dirs = ('awk', 'gcc', 'getconf', 'openssh', 'plymouth')
         for dir in dirs:
@@ -138,7 +124,3 @@ class Install(object):
         # remove dirs from usr/lib/python2.5/site-packages
         dirs = ('firmware_addon_dell', 'firmwaretools')
         map(lambda dir: rm(os.path.join(self.conf.treedir, 'usr', 'lib', 'python2.5', 'site-packages', dir)), dirs)
-
-        # remove dirs from etc/rc.d
-        dirs = ('rc?.d', 'rc', 'rc.local', 'rc.sysinit')
-        map(lambda dir: rm(os.path.join(self.conf.treedir, 'etc', 'rc.d', dir)), dirs)