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=bbe6117309e4e15b547cb61c1a7b221fec8c3a8a;hp=ec8e75882fed295216902cb8ddc6c389d3bae822;hb=16a29e1cd80caf1c63430038e653be3fa4258e0a;hpb=0a08c07e12394fabaf1b92b9c10f0632d88de1c3

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index ec8e758..bbe6117 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,25 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/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: Mon Nov 19 12:49:27 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
@@ -34,11 +22,24 @@ if ifclass RELEASE ; then
   [ -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 # resolvconf
+      # sanity check to avoid "input file is output file",
+      # see http://bts.grml.org/grml/issue984
+      if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
         cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-     else
+      else
+        echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
+        echo "       Looks like something is wrong, please fix manually." >&2
+        exit 1
+      fi
+    else # no resolvconf installed in chroot
+      if ! [ -L $target/etc/resolv.conf ] ; then
         cat /etc/resolv.conf >> $target/etc/resolv.conf
-     fi
+      else
+        echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
+        exit 1
+      fi
+    fi
   fi
 
   if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \