X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=4999714975f408423ee339119c6283a3cf9972b9;hp=5143318ba4f40a05e4cc472480db78c059cf9249;hb=81d68fd1cd4c828196882421dc42ec014007aa3f;hpb=35b57c1a91b745240d90149376d51a50412c3069

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 5143318..4999714 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,36 +1,32 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
-# Purpose:       retreive list of bugreports of installed packages inside chroot
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/96-apt-listbugs
+# Purpose:       retrieve 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 11:08:40 CET 2007 [mika]
 ################################################################################
 
+set -u
 set -e
 
-if ifclass RELEASE ; then
-
-  HOSTNAME=''
-  [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-  [ -n "$HOSTNAME" ] || HOSTNAME=grml
-
-  if [ -r /etc/resolv.conf ] ; then
-     if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
-        cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-     else
-        cat /etc/resolv.conf >> $target/etc/resolv.conf
-     fi
+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
   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
+         $LOGDIR/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