X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=8a4bc3f5d7726eb9b516cf45a9c6655dd689bf7a;hb=9dafaad2fe959f195d68a38655f60d00ee028256;hp=274b6bd1f3cdb24647b226b9a647927441b6c609;hpb=72e2af3f96620c3b488603ba4f04ca6047b8310c;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 274b6bd..8a4bc3f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,25 +1,37 @@
-#!/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 Oct 14 00:14:02 CEST 2007 [mika]
 ################################################################################
 
+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
+fi
+
+set +u
+if ifclass RELEASE ; then
 set -u
+  HOSTNAME=''
+  [ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+  [ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
+  [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
+  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/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
+     done
+  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}
-   done
 fi
 
 ## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2