X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=c75a1411e946cdfa92ae32c4db22d433c86713fe;hb=d338d0cc0f1a78f85e40e2fdf91476b780fa13ff;hp=5aabce6124ace9e6b4184f0dd71eb7d017db4f95;hpb=06cec9aaad60a380b76958916c9f5357013ea010;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 5aabce6..c75a141 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,32 +1,65 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+#!/bin/bash
+# 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.
-# Latest change: Sun Nov 04 01:42:58 CET 2007 [mika]
 ################################################################################
 
+set -u
 set -e
 
-if ifclass RELEASE ; then
+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
+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.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
-     cat /etc/resolv.conf >> $target/etc/resolv.conf
+    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
          SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
-         /var/log/fai/dirinstall/$HOSTNAME/bugs.${severity} || true # make sure it does not fail
+         /var/log/fai/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
      done
   fi
 
 fi
 
 ## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2