X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fgrml%2Fgrml_cleanup_chroot;h=074e60e8dde6ac1caecc92335cd7473f6629dadf;hp=62902bb601a2c4add99818ea00d9b54bbe3394bc;hb=6c00c3c1fd1e3fee0d10c1f1b4f6257d21d663d9;hpb=bbf62edbd7cc3872a074fee9d7361f689ba768fb diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot index 62902bb..074e60e 100755 --- a/etc/grml/fai/grml/grml_cleanup_chroot +++ b/etc/grml/fai/grml/grml_cleanup_chroot @@ -73,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 $? @@ -116,25 +100,11 @@ else ewarn "localepurg not available" ; eend 0 fi -if [ -d /var/lib/backuppc/pc/localhost/ ] ; then - einfo "Cleaning /var/lib/backuppc/pc/localhost/" - rm -rf /var/lib/backuppc/pc/localhost/* ; eend $? -else - ewarn "backuppc not installed" ; eend 0 -fi - # find /var -name \*.pid 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 @@ -163,14 +133,15 @@ 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 [ -r "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/hisax.ko" ] ; then - einfo "Removing /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/hisax.ko" - rm -f "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/hisax.ko" + 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 @@ -184,13 +155,9 @@ 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 + /etc/X11/XF86Config /etc/XF86Config /etc/XF86Config-4 eend $? einfo "Removing ssh-keys" @@ -255,12 +222,14 @@ else fi einfo "Cleaning and removing some misc files and directories" + find /etc -type f -name *.pre_fcopy -delete 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* \ /var/run/*/* /var/run/* /var/log/ksymoops/* /var/lock/*/* /var/lock/* \ /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/*.old /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 \ @@ -337,10 +306,17 @@ 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 +# so make sure it is OK in any case if [ -d /etc/resolvconf ] ; then - rm -rf /etc/resolvconf/run - mkdir /etc/resolvconf/run + if [ -L /etc/resolvconf/run ] ; then # resolvconf with /run + # /etc/resolvconf/run symlinks to /run/resolvconf + rm -rf /run/resolvconf + mkdir -p /run/resolvconf + else # no /run present + rm -rf /etc/resolvconf/run + mkdir /etc/resolvconf/run + fi + touch /etc/resolvconf/run/enable-updates mkdir /etc/resolvconf/run/interface cat > /etc/resolvconf/run/resolv.conf << EOF @@ -351,25 +327,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 {} \; @@ -383,10 +353,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 -# -# 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 #################################################################