From: Michael Prokop <devnull@localhost>
Date: Sun, 16 Dec 2007 16:25:40 +0000 (+0100)
Subject: Another resolv.conf update
X-Git-Tag: 0.0.13~14
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=edb41d03051eb5d125017c8706135cb0ab80d072

Another resolv.conf update
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index c984611..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 Dec 16 16:42:37 CET 2007 [mika]
+# Latest change: Sun Dec 16 17:18:14 CET 2007 [mika]
 ################################################################################
 
 set -e
@@ -35,9 +35,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