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

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index b75f55a..9e78a9f 100755
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -4,7 +4,6 @@
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Wed Sep 19 13:38:45 CEST 2007 [mika]
 ################################################################################
 
 # misc stuff
@@ -52,6 +51,12 @@ einfo "Setting up /etc/inittab"
 cp /etc/inittab.grml  /etc/inittab
 eend $?
 
+if [ "$(dpkg --list | awk '/^rc/ { print $2}')" != '' ] ; then
+   einfo "Purging removed packages"
+   dpkg --purge $(dpkg --list | awk '/^rc/ { print $2}')
+   eend $?
+fi
+
 if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then
    einfo "Cleaning up /usr/src/linux-headers-$KERNEL"
    ( cd /usr/src
@@ -68,22 +73,6 @@ if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then
    eend $?
 fi
 
-if [ -L /usr/include/linux ] ; then
-  einfo "/usr/include/linux is ok" ; eend 0
-elif [ -n "$GRML64" ] ; then
-    if [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
-       einfo "grml64 detected, assuming /usr/src/linux-headers-$KERNEL is ok." ; eend 0
-    else
-       ewarn "Warning: /usr/src/linux-headers-$KERNEL not found, exiting." ; eend 0
-    fi
-elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
-     ewarn "Warning: /usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ (possible an error)"
-     ewarn "Common reason: you forgot to install linux-kernel-headers-grml and use linux-libc-dev instead"
-     eend 0
-else
-     ewarn "Warning: linux-headers-$KERNEL not installed." ; eend 0
-fi
-
 einfo "Creating ~/.zshrc"
   touch ~/.zshrc
 eend $?
@@ -123,17 +112,11 @@ einfo "Removing pid-files"
   find /var/run -name \*.pid -exec rm {} \;
 eend $?
 
-einfo "Unmounting proc, /dev/pts, /dev/capi"
-  umount /proc     2>/dev/null
-  umount /dev/pts  2>/dev/null
-  umount /dev/capi 2>/dev/null
-  umount -a 2>/dev/null
-eend $?
-
 einfo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
   rm -f /var/lib/apt/lists/*Packages
   rm -f /var/lib/apt/lists/*Release
   rm -f /var/lib/apt/lists/*Sources
+  rm -f /var/lib/apt/lists/*IndexDiff
   rm -f /var/lib/apt/lists/*.gpg
   rm -f /var/cache/apt-show-versions/*
   rm -f /var/cache/debconf/templates.dat-old
@@ -145,6 +128,31 @@ einfo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
   rm -f /var/lib/dpkg/available-old
 eend $?
 
+if ifclass GRML_SMALL ; then
+   einfo "Removing /var/cache/debconf/templates.dat"
+   rm -f /var/cache/debconf/templates.dat
+   eend $?
+
+   einfo "Removing /usr/share/ssh/blacklist.*"
+   rm -f /usr/share/ssh/blacklist.DSA-1024 /usr/share/ssh/blacklist.RSA-2048
+   eend $?
+fi
+
+# get rid of large kernel modules:
+if ifclass GRML_SMALL ; then
+  einfo "Identified grml-small, removing some very large kernel drivers:"
+  if [ -r "/lib/modules/${KERNEL}/kernel/fs/ocfs2/ocfs2.ko" ] ; then
+    einfo "Removing /lib/modules/${KERNEL}/kernel/fs/ocfs2/ocfs2.ko"
+    rm -f "/lib/modules/${KERNEL}/kernel/fs/ocfs2/ocfs2.ko"
+    eend $?
+  fi
+  if [ -d "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/" ] ; then
+    einfo "Removing /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax"
+    rm -rf "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax"
+    eend $?
+  fi
+fi
+
 if [ -x /usr/bin/grep-dctrl ] ; then
    einfo "Cleaning up /var/lib/dpkg/status"
    grep-dctrl -v -F Status "purge ok not-installed" /var/lib/dpkg/status > status.new && \
@@ -160,13 +168,17 @@ eend $?
 
 einfo "Removing x-server-conffiles"
   rm -f /etc/X11/xorg.conf /etc/X11/XF86Config-4 \
-        /etc/X11/XF86Config /etc/XF86Config /etc/XF86Config-4 
+        /etc/X11/XF86Config /etc/XF86Config /etc/XF86Config-4
 eend $?
 
 einfo "Removing ssh-keys"
   rm -f /etc/ssh/*key*
 eend $?
 
+einfo "Removing unused/backup files"
+  find / -name *~ -print0 | xargs -0 rm -f
+eend $?
+
 # remove only "temporary" or saved files in the given directories
 nuke(){
   for i in `find "$@" -name \*.gz -o -name \*.bz2 -o -name \*.0 2>/dev/null`; do
@@ -227,7 +239,7 @@ 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 2>/dev/null
+         /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
@@ -236,7 +248,6 @@ einfo "Cleaning and removing some misc files and directories"
          /var/lib/games /var/cache/man      \
          /var/lib/nfs   /var/lib/xkb        \
          /var/mail/grml /var/account/pacct
-  mkdir -p /etc/sysconfig/network-scripts /etc/sysconfig/provider
   # Recreate empty utmp and wtmp
   :>/var/run/utmp
   :>/var/run/wtmp
@@ -318,25 +329,19 @@ fi
 
 if [ -x /usr/bin/updatedb ] ; then
   einfo "Updating locate-database"
-  mount -t proc none /proc
   updatedb --prunepaths='/tmp /usr/tmp /var/tmp /grml /root /proc /sys'
-  umount /proc
   eend $?
 else
   ewarn "updatedb not installed" ; eend 0
 fi
 
-einfo "Unmounting all filesystems"
-  umount -a
-eend $?
-
 ################################################################################
 # MISC STUFF
 # ~~~~~~~~~~
 # list dangling symlinks: ls **/*(-@)
 #
 # Security-audit:
-# find / \! -type l -perm -2000 -ls > audit/sgid-files 
+# find / \! -type l -perm -2000 -ls > audit/sgid-files
 # find / \! -type l -perm -0002 -ls > audit/world-writeable-files
 # find / \! -type l -perm -4000 -ls > audit/suid-files
 # find / ( -perm 4000 -o -perm -2000 \) -exec ls -ld {} \;
@@ -350,7 +355,7 @@ eend $?
 # 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 
+# 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