cleanup script: Drop ion3 stuff, since we do not ship ion3 anymore.

[grml-live.git] / etc / grml / fai / grml / grml_cleanup_chroot

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 2ad900b..5c591ef 100755 (executable)
--- 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/*
@@ -306,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