X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=8a4bc3f5d7726eb9b516cf45a9c6655dd689bf7a;hb=3f2b59dad6f8e2bcd6c3faad429976801c27d6b7;hp=c75a1411e946cdfa92ae32c4db22d433c86713fe;hpb=d338d0cc0f1a78f85e40e2fdf91476b780fa13ff;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 c75a141..8a4bc3f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -20,37 +20,9 @@ if ifclass RELEASE ; then
 set -u
   HOSTNAME=''
   [ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-  [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+  [ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
   [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-  if [ -r /etc/resolv.conf ] ; then
-    case "$(readlink -f ${target}/etc/resolv.conf)" in
-      /run/*) # resolvconf with /run
-        mkdir -p $target/run/resolvconf
-        cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
-        ;;
-      /lib/*) # 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
-        ;;
-      *) # no resolvconf
-        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
-        ;;
-    esac
-  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