[Fai-commit] r3062 - people/michael/bugfixes/305783/examples/simple/scripts/FAIBASE

[fai-repository at svn.debian.org]

Author: michael-guest
Date: 2005-11-17 20:02:42 +0000 (Thu, 17 Nov 2005)
New Revision: 3062

Modified:
   people/michael/bugfixes/305783/examples/simple/scripts/FAIBASE/30-interface
Log:
added the patch I already proposed in the BTS


Modified: people/michael/bugfixes/305783/examples/simple/scripts/FAIBASE/30-interface
===================================================================
--- people/michael/bugfixes/305783/examples/simple/scripts/FAIBASE/30-interface	2005-11-17 19:53:36 UTC (rev 3061)
+++ people/michael/bugfixes/305783/examples/simple/scripts/FAIBASE/30-interface	2005-11-17 20:02:42 UTC (rev 3062)
@@ -22,8 +22,8 @@
 	  gateway $GATEWAYS
 EOF
     echo "localnet $NETWORK" > $target/etc/networks
-    [ -s /tmp/etc/resolv.conf ] && cp -p /tmp/etc/resolv.conf $target/etc
-    fcopy -i /etc/resolv.conf
+    [ -s /tmp/etc/resolv.conf -a ! -L $target/etc/resolv.conf ] && cp -p /tmp/etc/resolv.conf $target/etc
+    fcopy -li /etc/resolv.conf
 fi
 
 # here fcopy is mostly used, when installing a client for running in a