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=65a1f530528719b0297e70e128ba81b50a9d53cb;hp=a8b4a3813373d5135bb2455076900dbc283eef3e;hb=6c00c3c1fd1e3fee0d10c1f1b4f6257d21d663d9;hpb=130429e20fb319f3ec6a457f3219b7e52216b542

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index a8b4a38..65a1f53 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,18 +22,35 @@ if ifclass RELEASE ; then
   [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
   if [ -r /etc/resolv.conf ] ; then
-     if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
-        cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-     else
-        cat /etc/resolv.conf >> $target/etc/resolv.conf
-     fi
+    if [ -d $target/etc/resolvconf/run ] ; then # resolvconf without /run
+      # 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
+	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
+    elif [ -L $target/etc/resolvconf/run ] ; then # resolvconf with /run
+      # /etc/resolvconf/run symlinks to /run/resolvconf
+      mkdir -p $target/run/resolvconf
+      cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
+    else # no resolvconf installed in chroot
+      if ! [ -L $target/etc/resolv.conf ] ; then
+	cat /etc/resolv.conf >> $target/etc/resolv.conf
+      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 ] && \
      [ -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