Rework resolv.conf handling, error out on wrong symlinks. [Closes: issue984]

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 96-apt-listbugs

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 4d2051b..bbe6117 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,10 +1,9 @@
-#!/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: Fri Dec 21 21:40:25 CET 2007 [mika]
 ################################################################################
 
 set -e
@@ -23,11 +22,24 @@ if ifclass RELEASE ; then
   [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
   if [ -r /etc/resolv.conf ] ; then
-     if [ -d $target/etc/resolvconf/run ] ; 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
-     elif [ ! -L $target/etc/resolv.conf ] ; then
+      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 ] && \