From: Michael Prokop <devnull@localhost>
Date: Sun, 4 Nov 2007 10:01:48 +0000 (+0100)
Subject: Copy /etc/resolv.conf in /etc/grml/fai/config/hooks/instsoft.GRMLBASE
X-Git-Tag: 0.0.8~29
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=a77e159c5acaacf817cb8537915186e28e1a2f3c

Copy /etc/resolv.conf in /etc/grml/fai/config/hooks/instsoft.GRMLBASE
---

diff --git a/debian/changelog b/debian/changelog
index ee203b7..1c8ea1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 grml-live (0.0.8) unstable; urgency=low
 
   * Copy /etc/resolv.conf to chroot in
-    /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+    /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs and
+    /etc/grml/fai/config/hooks/instsoft.GRMLBASE as well.
 
  -- Michael Prokop <mika@grml.org>  Sun, 04 Nov 2007 01:43:06 +0100
 
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 063c929..ab27f3d 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -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: Thu Nov 01 16:18:38 CET 2007 [mika]
+# Latest change: Sun Nov 04 11:01:20 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -14,7 +14,12 @@ set -e
 echo grml_chroot > $target/etc/debian_chroot
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   echo "Softupdate"
+   echo "Softupdate of FAI via grml-live running"
+
+   if [ -r /etc/resolv.conf ] ; then
+      cat /etc/resolv.conf >> $target/etc/resolv.conf
+   fi
+
    # make sure we prefer grml repository:
    if [ -r /etc/grml/fai/apt/preferences ] ; then
       cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences