X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=8049d7ef7a1570f091abbde144887b1622b6fffd;hb=5a00bf358eac8ba6c00666f3fa6670d9c3f58b9b;hp=c5095de79bc7f3fa2ecc77d11cb28eab2b38c5d0;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index c5095de..8049d7e 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -23,31 +23,6 @@ set -u
   [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
   [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-  if [ -r /etc/resolv.conf ] ; then
-    if [ -d $target/etc/resolvconf/run ] ; then # resolvconf without /run
-      # sanity check to avoid "input file is output file",
-      # see http://bts.grml.org/grml/issue984
-      if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
-	cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-      else
-	echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
-	echo "       Looks like something is wrong, please fix manually." >&2
-	exit 1
-      fi
-    elif [ -L $target/etc/resolvconf/run ] ; then # resolvconf with /run
-      # /etc/resolvconf/run symlinks to /run/resolvconf
-      mkdir -p $target/run/resolvconf
-      cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
-    else # no resolvconf installed in chroot
-      if ! [ -L $target/etc/resolv.conf ] ; then
-	cat /etc/resolv.conf >> $target/etc/resolv.conf
-      else
-	echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
-	exit 1
-      fi
-    fi
-  fi
-
   if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \
      [ -x $target/etc/apt/grml/listbugs ] ; then
      for severity in critical grave serious ; do