resolv.conf handling: resolve symlink inside chroot + drop resolvconf from 96-apt...

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 96-apt-listbugs

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index f1083d3..8049d7e 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,34 +1,28 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/96-apt-listbugs
 # Purpose:       retreive list of bugreports of installed packages inside chroot
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
+set -u
 set -e
 
 if [ -r $target/etc/apt/apt.conf.d/10apt-listbugs ] ; then
-   if [ -x $target/usr/sbin/apt-listbugs ] ; then
-      sed -i 's#//DPkg::#DPkg::#' $target/etc/apt/apt.conf.d/10apt-listbugs
-   fi
+  if [ -x $target/usr/sbin/apt-listbugs ] ; then
+    sed -i 's#//DPkg::#DPkg::#' $target/etc/apt/apt.conf.d/10apt-listbugs
+  fi
 fi
 
+set +u
 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 "$HOSTNAME" ] || HOSTNAME=grml
 
-  if [ -r /etc/resolv.conf ] ; then
-     if [ -d $target/etc/resolvconf/run ] ; then
-        cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-     elif [ ! -L $target/etc/resolv.conf ] ; then
-        cat /etc/resolv.conf >> $target/etc/resolv.conf
-     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
@@ -40,3 +34,4 @@ if ifclass RELEASE ; then
 fi
 
 ## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2