X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fgrml%2Fgrml_cleanup_chroot;h=5c591ef61f7b2970222c0733c02aba4030ff70b3;hb=96e44eeeef0dfb39e305faeede9afdf7bc0ee9af;hp=f6fc85fb62287c78c90dd22cfb0920db8d5e229a;hpb=e1e1975bb96a77608640a839f9ff14cab57203af;p=grml-live-grml.git

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index f6fc85f..5c591ef 100755
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -77,14 +77,6 @@ einfo "Creating ~/.zshrc"
   touch ~/.zshrc
 eend $?
 
-if [ -r /usr/share/lintian/overrides/ion3 ] ; then
-  einfo "Stripping ion3-stuff"
-  cat /usr/share/lintian/overrides/ion3 | sed 's#.*./usr#/usr#' | \
-  sed 's/.comment//' | xargs strip --strip-unneeded ; eend $?
-else
-  ewarn "ion3 not installed" ; eend 0
-fi
-
 if [ -d /usr/lib/valgrind/x86-linux/ ] ; then
   einfo "Stripping /usr/lib/valgrind/x86-linux/"
   strip  --strip-unneeded  /usr/lib/valgrind/x86-linux/*
@@ -100,13 +92,6 @@ 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 {} \;
@@ -313,10 +298,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