X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fgrml%2Fgrml_cleanup_chroot;h=dac26fbc1a5247f8bdb74ed889840cdb16a888e1;hb=1455f914da3d0cf8a96ecb78261e9d6f8d8610cc;hp=9e78a9f5956336ff5b1cb54ba091046c05220ad1;hpb=79e718c57525350279fd033da8a387763bb7faca;p=grml-live-grml.git

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 9e78a9f..dac26fb 100755
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -162,10 +162,6 @@ else
    ewarn "Warning: /usr/bin/grep-dctrl not available."
 fi
 
-einfo "Copying original runlevel.conf to /etc/runlevel.conf"
-cp /etc/runlevel.conf.livecd /etc/runlevel.conf
-eend $?
-
 einfo "Removing x-server-conffiles"
   rm -f /etc/X11/xorg.conf /etc/X11/XF86Config-4 \
         /etc/X11/XF86Config /etc/XF86Config /etc/XF86Config-4
@@ -239,7 +235,8 @@ einfo "Cleaning and removing some misc files and directories"
          /var/state/*/* /var/state/* /var/log/nessus/*                            \
          /halt /reboot /ash.static /etc/dhcpc/*.info /etc/dhcpc/resolv*           \
          /etc/*passwd- /etc/*shadow- /etc/*group- /var/spool/postfix/maildrop/*   \
-         /etc/lvm/.cache /etc/lvm/cache/.cache /etc/lvm/backup/main 2>/dev/null
+         /etc/*.old /etc/*.pre_fcopy /etc/*.original /etc/lvm/.cache              \
+         /etc/lvm/cache/.cache /etc/lvm/backup/main 2>/dev/null
   rm -rf /tmp/* /var/tmp/* /var/tmp/.* /var/backups/* /.ssh /root/.ssh /home/*/.ssh \
          /home/grml/* /home/grml/.??* /var/lib/texmf/ls-R  /var/spool/texmf/ls-R    \
          /var/lib/mysql /var/log/lilo_log.* /core* 2>/dev/null
@@ -355,10 +352,7 @@ fi
 # file /usr/sbin/* | grep -v ', stripped' | grep -v 'perl' | grep -v 'Bourne' | grep -v 'python' | grep -v 'symbolic link'
 #
 # Is software by grml-repos up2date?
-# grep-dctrl --field Maintainer 'Michael Prokop' /var/lib/apt/lists/grml.org_repos_._* | grep Package | awk '{print $2}' | xargs echo
-#
-# runlevel.conf:
-# for file in /etc/init.d/* ; do grep $file -q /etc/runlevel.conf.hdinstall || echo $file not found ; done
+# grep-dctrl --field Maintainer 'Michael Prokop' /var/lib/apt/lists/* | grep Package | awk '{print $2}' | xargs echo
 ################################################################################
 
 ## END OF FILE #################################################################