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=d774289bc7d6838eec179afd88d572cc5b8edcb2;hb=6c00c3c1fd1e3fee0d10c1f1b4f6257d21d663d9;hpb=31918d2b0a17b361e0d2c537d2aad0aa243814ef

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index d774289..074e60e 100755
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -100,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
@@ -169,10 +155,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
@@ -240,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    \
@@ -322,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
@@ -336,18 +327,12 @@ 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
 # ~~~~~~~~~~
@@ -368,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 #################################################################