X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fgrml%2Fgrml_cleanup_chroot;h=e58bbfaf1ed6e441d86e2777856b3f4d293e495c;hp=213ee0093ec84cf3a6ab7f5f73a1abff116d9b6d;hb=3e5fb2360b0df8563ade7c0ec43acf655698fc13;hpb=fcd920d41a92ba3129027f947a6de9acfb76ab6e diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot index 213ee00..e58bbfa 100755 --- a/etc/grml/fai/grml/grml_cleanup_chroot +++ b/etc/grml/fai/grml/grml_cleanup_chroot @@ -1,58 +1,28 @@ #!/bin/bash -# Filename: grml.clean +# Filename: /etc/grml/fai/grml/grml_cleanup_chroot # Purpose: clean up grml chroot # Authors: (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ -# License: This file is copyright by Michael Prokop -# Latest change: Thu May 17 15:44:56 CEST 2007 [mika] +# License: This file is licensed under the GPL v2. ################################################################################ # misc stuff umask 022 - . /etc/grml_colors || exit 5 . /etc/grml/lsb-functions || exit 6 - -# /usr/share/doc/texlive-latex-recommended/latex/ -# /usr/share/doc/texlive-latex-base/latex/ -# /usr/share/doc/texlive-base-bin/pdftex/thanh/ -# /usr/share/doc/texlive-latex-base/latex/base/ -# /usr/share/doc/texlive-latex-base/latex/hyperref/ -# /usr/share/doc/texlive-latex-base/generic/babel/ -# /usr/share/doc/texlive-latex-recommended/latex/koma-script/ -# /usr/share/doc/texmf/pgf/pgfmanual.pdf.gz - -# variables - grep -q small /etc/grml_version && GRML_SMALL=yes || GRML_SMALL='' [ -x /lib64 ] && GRML64=yes || GRML64='' -# if [ -n "$GRML_SMALL" ] ; then -# echo -n 'Are you sure you want to run GRML_SMALL stuff? [y|N] ' -# read a -# if [ "$a" == 'y' ] ; then -# echo 'Continuing as requested.' -# else -# echo 'Exiting as requested.' -# unset GRML_SMALL -# exit 1 -# fi -# fi # detect kernel version, assume newest kernel version KERNEL=$(ls -1 /lib/modules/ | sort -r -u | head -1) if [ -f /usr/share/fonts/X11/misc/artwiz-cursor.pcf.gz ] ; then if dpkg-divert --list artwiz-cursor | grep -q /usr/share/fonts/X11/misc/cursor.pcf.gz ; then - eerror "Broken diversion of artwiz-cursor, see #341397" - exit 1 + eerror "Broken diversion of artwiz-cursor, see #341397, trying to fix it" + ( cd /usr/share/fonts/X11/misc/ && + dpkg-divert --remove /usr/share/fonts/X11/misc/cursor.pcf.gz && mkfontdir ) + eend 0 fi fi -#if [ -r /usr/share/fonts/X11/misc/cursor.pcf.gz ] ; then -# einfo "Fixing the broken artwiz-cursor" -# ( cd /usr/share/fonts/X11/misc/ && \ -# dpkg-divert --remove /usr/share/fonts/X11/misc/cursor.pcf.gz && mkfontdir ) -# eend $? -#fi - # start of main cleanup process... if ! [ -r /boot/config-"$KERNEL" ] ; then eerror "/boot/config-$KERNEL not available. \$KERNEL not set to correct value?" @@ -60,20 +30,11 @@ if ! [ -r /boot/config-"$KERNEL" ] ; then exit 9 fi -einfo "Preparing grml-system: `cat /etc/grml_version`." ; eend 0 +einfo "Preparing grml-system: $(cat /etc/grml_version)" ; eend 0 einfo "Setting up /etc/motd.tail" echo "" > /etc/motd.tail ; eend 0 -einfo "Do not forget to run the final check:" - eindent - einfo 'adjust grml-version: vim -X /etc/grml_version' - einfo 'is runlevel.conf ok: vimdiff -X /etc/runlevel.conf /etc/runlevel.conf.livecd' - einfo 'find old files: find /etc -name \*dpkg\*' - einfo "delete conffiles: dpkg --purge \`dpkg --list | grep '^rc' | awk '{print \$2}'\`" - einfo 'dangling symlinks: ls **/*(-@)' - eoutdent - einfo "Setting up /etc/modules: " cat>/etc/modules<> /etc/modules eend 0 einfo "Setting up /etc/inittab" -if [ -z "$GRML_SMALL" ] ; then - cp /etc/inittab.grml /etc/inittab -else - cp /etc/inittab.small /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 -eend 0 -if [ -z "$GRML_SMALL" ] ; then - 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 - eerror "/usr/src/linux-headers-$KERNEL not found, exiting." ; eend 1 - exit 10 - fi - elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then - eerror "/usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ - error" - eend 1 - exit 10 - else - ewarn "linux-headers-$KERNEL not installed." ; eend 0 - fi +if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then + einfo "Cleaning up /usr/src/linux-headers-$KERNEL" + ( cd /usr/src + VER=$(/bin/ls -d /usr/src/linux-headers-* | head -1) + VER=${VER##/usr/src/linux-headers-} + if [ -n "$VER" ] ; then + VER=$VER make clean && \ + VER=$VER make symlinks + else + make clean && \ + make symlinks + fi + ) + eend $? fi einfo "Creating ~/.zshrc" @@ -152,29 +112,13 @@ 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 initrd-images" -# rm -f /boot/initrd.img-* -#eend $? - einfo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin" - # for i in $(find /var/lib/apt/lists -type f \( -name \*Packages -o -name \*Sources \) 2>/dev/null); do :>"$i"; done - # for i in /var/lib/apt/lists/*_{Release,Packages,Sources}; do :>$i; touch -t 198103190000.00 $i; done - # sync-available 2>/dev/null - # apt-get check 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/* - # :> /var/cache/apt/pkgcache.bin - # :> /var/cache/apt/srcpkgcache.bin rm -f /var/cache/debconf/templates.dat-old rm -f /var/cache/apt/*.bin apt-get check 2>/dev/null @@ -184,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 && \ @@ -193,23 +162,19 @@ else ewarn "Warning: /usr/bin/grep-dctrl not available." fi -einfo "Copying original runlevel.conf to /etc/runlevel.conf" - if ! [ -z $GRML_SMALL ] ; then - cp /etc/runlevel.conf.livecd.small /etc/runlevel.conf - else - cp /etc/runlevel.conf.livecd /etc/runlevel.conf - fi -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 @@ -224,8 +189,6 @@ zero(){ done } -#rmdir /mnt/cdrom?* /mnt/hd?* 2>/dev/null - #for i in `find /usr/*/man -name \*.\[0-9ln\]` ; do # [ -f "$i".gz -o -f "$i".bz2 ] && rm -f "$i" #done @@ -243,9 +206,6 @@ einfo "Running apt-get clean" apt-get clean eend $? -# remove files from packages which have been removed -# COLUMNS=200 dpkg --purge `dpkg -l | grep '^rc' | awk '{ print $2 }'` - if [ -x /usr/bin/nvi ] ; then if ! [ -d /var/tmp/vi.recover ] ; then einfo "Creating nvi /var/tmp directory" @@ -261,7 +221,6 @@ fi if [ -x /sbin/depmod ] ; then if [ -r /lib/modules/$KERNEL ] ; then einfo "Updating modules.dep for kernel $KERNEL" - # depmod -a $KERNEL depmod -ae -F /boot/System.map-"$KERNEL" "$KERNEL" eend $? fi @@ -269,38 +228,6 @@ else ewarn "depmod not installed" ; eend 0 fi -if [ -n "$NOONLINE" ] ; then - einfo "\$NOONLINE is set, skipping online tasks" ; eend 0 -else - -if [ -x /usr/bin/freshclam ] ; then - einfo "Updating clamav database via running freshclam" - /usr/bin/freshclam ; eend $? -else - ewarn "freshclam not installed" ; eend 0 -fi - -if [ -x /usr/bin/update-pciids ] ; then - einfo "Updating PCI- and USB-ids" - update-pciids - update-usbids -# ls -la /usr/share/misc/*.ids* -# ls -la /var/lib/usbutils/usb* - eend $? -else - ewarn "update-pciids/update-usbids not installed" ; eend 0 -fi - -if [ -x /usr/sbin/nessus-update-plugins ] ; then - einfo "Updating nessus-plugins" - nessus-update-plugins - eend $? -else - ewarn "nessus-update-plugins not installed" ; eend 0 -fi - -fi # end of $NOONLINE-check - einfo "Cleaning and removing some misc files and directories" rm -f /etc/sysconfig/* /etc/motd.dpkg-new /etc/auto.master.distrib.dpkg-new \ /etc/samba/*.SID /etc/samba/*.tdb /dev/mouse* /dev/cdrom* /dev/cdwriter* \ @@ -308,16 +235,15 @@ 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.* 2>/dev/null + /var/lib/mysql /var/log/lilo_log.* /core* 2>/dev/null nuke /var/log /var/cache zero /var/local /var/log /var/spool \ /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 @@ -331,11 +257,6 @@ else ewarn "update-ca-certificates not installed" ; eend 0 fi -# some stuff does not have to run every single time... -if [ -n "$FAST" ] ; then - einfo "\$FAST is set, skipping some tasks" ; eend 0 -else - # regenerate module dependencies and ls.so.cache if [ -x /sbin/ldconfig ] ; then einfo "Updating ld.so.cache" @@ -345,14 +266,6 @@ else ewarn "ldconfig not installed" ; eend 0 fi -#if [ -r /lib/modules/$KERNEL/ ] ; then -# einfo "Searching for modules not compiled against $KERNEL" -# ( cd /lib/modules/$KERNEL/ && modinfo **/*.ko | grep vermagic | grep -v $KERNEL ) -# eend 0 -#else -# eerror "/lib/modules/$KERNEL/ not found" ; eend 1 -#fi - if [ -x /usr/bin/update-menus ] ; then einfo "Updating windowmanager menus" update-menus -v @@ -378,30 +291,6 @@ else ewarn "mandb not installed" ; eend 0 fi -#if [ -n "$GRML_SMALL" ] ; then -# einfo "Cleaning up /etc/skel..." -# rm -rf /etc/skel/.fluxbox -# rm -rf /etc/skel/.gkrellm2 -# rm -rf /etc/skel/.idesktop -# rm -rf /etc/skel/.pekwm -# eend $? -# -# einfo "Cleaning documentation directories..." -# mv /usr/share/doc/grml-docs /tmp/ -# rm -rf /usr/share/doc -# mkdir /usr/share/doc -# mv /tmp/grml-docs /usr/share/doc/grml-docs -# rm -rf /usr/share/gtk-doc/ -# rm -rf /usr/share/man/ -# rm -rf /usr/man -# rm -rf /usr/share/info -# eend $? -# -# einfo "Creating /usr/share/info/..." -# mkdir -p /usr/share/info/ -# eend $? -#fi - if [ -d /var/lib/clamav/ ] ; then einfo "Cleaning /var/lib/clamav/" rm -f /var/lib/clamav/clamav-* ; eend $? @@ -420,28 +309,35 @@ if ! [ -r /etc/ld.so.nohwcap ] ; then touch /etc/ld.so.nohwcap fi +# installation of resolvconf in chroot *with* /proc +# is different from an installation without /proc, +# so make sure it is OK in any case; don't use /dev/shm +if [ -d /etc/resolvconf ] ; then + rm -rf /etc/resolvconf/run + mkdir /etc/resolvconf/run + touch /etc/resolvconf/run/enable-updates + mkdir /etc/resolvconf/run/interface + cat > /etc/resolvconf/run/resolv.conf << EOF +# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8) +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +EOF +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 -fi # end of $FAST-check - -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 {} \; @@ -454,30 +350,8 @@ eend $? # list non-stripped files: # file /usr/sbin/* | grep -v ', stripped' | grep -v 'perl' | grep -v 'Bourne' | grep -v 'python' | grep -v 'symbolic link' # -# einfo "Removing unused architecture Kernel sources: " -# for i in `ls -1 /usr/src/linux/arch/ | grep -v i386`; do -# echo -n "$i "; rm -rf /usr/src/linux/arch/"$i" /usr/src/linux/include/asm-"$i" -# done -# eend $? -# # 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 ################################################################################ -# ISO -# ~~~ -# /usr/bin/mksquashfs /home/mika/grml/chroot/grml_uncompressed.large/* \ -# /home/mika/grml/chroot/grml_cd.large/GRML/GRML -noappend -sort /home/mika/grml/svn/grml/remastering/sort -# -# mkisofs -V "grml 0.8" -publisher 'Michael Prokop ' -l -r \ -# -J -no-emul-boot -boot-load-size 4 -boot-info-table -c boot/isolinux/boot.cat \ -# -b boot/isolinux/isolinux.bin -o /home/mika/grml/chroot/grml_0.8.iso . -# -# vim grml_cd.large/GRML/grml-version -# -# find . -type f -not -name md5sums -not -name boot.cat -exec md5sum {} \; > GRML/md5sums -################################################################################ -# + ## END OF FILE #################################################################