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=d0baa3f3d01b05298eeccb9a073a6c1548ce714e;hp=2f72fd3a6d4bfedde50b838ba7500709600fdd8c;hb=184eabc67a016efb8b42364b1dab400ef72a00e0;hpb=edb41d03051eb5d125017c8706135cb0ab80d072

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 2f72fd3..d0baa3f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,54 +1,32 @@
-#!/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 Dec 16 17:18:14 CET 2007 [mika]
 ################################################################################
 
+set -u
 set -e
 
-# Defaults:
-#apt-listchanges apt-listchanges/confirm boolean false
-#apt-listchanges apt-listchanges/email-address   string  root
-#apt-listchanges apt-listchanges/which   select  news
-#apt-listchanges apt-listchanges/frontend        select  pager
-#apt-listchanges apt-listchanges/save-seen       boolean true
-if [ -x $target/usr/bin/apt-listchanges ] ; then
-   echo 'apt-listchanges apt-listchanges/confirm boolean true' | $ROOTCMD debconf-set-selections
-   echo 'apt-listchanges apt-listchanges/which   select  both' | $ROOTCMD debconf-set-selections
-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
+  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
-
-  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
-
+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/$HOSTNAME/last/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