X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=06518e9cc71d137ecf9f92489acb5643cfd32e24;hb=961a5ebdae6d44584eba0d413f6541838865aead;hp=19c68440625e96c58948e1fe9855b7a1fb584018;hpb=f8d2fa05f607bf4440317c21ea0858d78b26891d;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 19c6844..06518e9 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -4,20 +4,39 @@
 # 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: Sat Oct 13 18:03:15 CEST 2007 [mika]
 ################################################################################
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
-
-if [ -x $target/usr/sbin/apt-listbugs ] ; then
-   for severity in critical grave serious ; do
-       apt-listbugs -s $severity list $(apt-show-source | \
-       grep -v -e 'not installed' -e '--------------' -e 'Version' | \
-       awk '{print $4;}' | grep -v '^[() ]*$'| sort | uniq) \
-       /var/log/fai/dirinstall/$HOSTNAME/bugs.${severity}
-   done
+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
+
+if ifclass RELEASE ; then
+
+  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
+         SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
+         /var/log/fai/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
+     done
+  fi
+
 fi
 
 ## END OF FILE #################################################################