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=4d2051b86c41c93d9958cde9c32acdb450f8af6d;hp=c984611a491281947a4c653065566b212415598e;hb=2d405b7da603a62c59b0dc20d502e19dc973b1d7;hpb=6606325e0ddec8ec74336cbe11e9bdc5b4477429

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index c984611..4d2051b 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -4,22 +4,11 @@
 # 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 16:42:37 CET 2007 [mika]
+# Latest change: Fri Dec 21 21:40:25 CET 2007 [mika]
 ################################################################################
 
 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
@@ -35,9 +24,9 @@ if ifclass RELEASE ; then
 
   if [ -r /etc/resolv.conf ] ; then
      if [ -d $target/etc/resolvconf/run ] ; then
-        cat /etc/resolv.conf > $target/etc/resolvconf/run/resolv.conf
-     else
-        cat /etc/resolv.conf > $target/etc/resolv.conf
+        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