X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=2f72fd3a6d4bfedde50b838ba7500709600fdd8c;hb=c3fbb9d76a3a908d1b532572b57504ec958a5c01;hp=4650cad290ac49d137e1a45264118907725e4997;hpb=38d1b42e250e77bac9d5a8c6cdc0c0406af6d090;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 4650cad..2f72fd3 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -4,7 +4,7 @@
 # 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 22:40:43 CET 2007 [mika]
+# Latest change: Sun Dec 16 17:18:14 CET 2007 [mika]
 ################################################################################
 
 set -e
@@ -21,19 +21,22 @@ if [ -x $target/usr/bin/apt-listchanges ] ; then
 fi
 
 if [ -r $target/etc/apt/apt.conf.d/10apt-listbugs ] ; then
-   sed -i 's#//DPkg::#DPkg::#' $target/etc/apt/apt.conf.d/10apt-listbugs
+   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.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 [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
+     if [ -d $target/etc/resolvconf/run ] ; then
         cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-     else
+     elif [ ! -L $target/etc/resolv.conf ] ; then
         cat /etc/resolv.conf >> $target/etc/resolv.conf
      fi
   fi
@@ -42,7 +45,7 @@ if ifclass RELEASE ; then
      [ -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