X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=63ae67de70de74cd5184bae7f8200470be11f236;hb=35b57c1a91b745240d90149376d51a50412c3069;hp=063c929b1cbbb9517a8ae856e934444b8798b403;hpb=bddded93df88ad91d9ad8590950ce62a3b2e2e38;p=grml-live.git diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 063c929..63ae67d 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 # 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:08:53 CET 2007 [mika] ################################################################################ set -u @@ -14,7 +14,16 @@ 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 + 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 + 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