X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=447b40ef88e0376fd49a5018a92c48cbcd570c8e;hb=9838a1360e0675cc06ef853848d42793c51e3701;hp=ab27f3d02f8755e4f5ceab8882830f5cf804b623;hpb=a77e159c5acaacf817cb8537915186e28e1a2f3c;p=grml-live.git diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index ab27f3d..447b40e 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: Sun Nov 04 11:01:20 CET 2007 [mika] +# Latest change: Sun Nov 04 11:21:02 CET 2007 [mika] ################################################################################ set -u @@ -17,7 +17,15 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then echo "Softupdate of FAI via grml-live running" if [ -r /etc/resolv.conf ] ; then - cat /etc/resolv.conf >> $target/etc/resolv.conf + 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 + + if [ -r $target/etc/policy-rc.d.conf ] ; then + sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf fi # make sure we prefer grml repository: