[Fai-commit] r3084 - in trunk: debian examples/simple/scripts/FAIBASE

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-23 12:32:57 +0000 (Wed, 23 Nov 2005)
New Revision: 3084

Modified:
   trunk/debian/changelog
   trunk/examples/simple/scripts/FAIBASE/30-interface
Log:
do not overwrite resolv.conf if it's a symlink (closes: #305783)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-23 12:26:32 UTC (rev 3083)
+++ trunk/debian/changelog	2005-11-23 12:32:57 UTC (rev 3084)
@@ -31,6 +31,8 @@
   * FAIBASE/10-misc: with the new fai-kernels package we can call tune2fs
     even when using a 2.6 kernel (closes: #307147)
   * ftar: test if $single is set (closes: #340421)
+  * FAIBASE/30-interface: do not overwrite resolv.conf if it's a symlink
+    (closes: #305783)
   
  -- Thomas Lange <lange at debian.org>  Wed, 23 Nov 2005 12:58:56 +0100
 

Modified: trunk/examples/simple/scripts/FAIBASE/30-interface
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/30-interface	2005-11-23 12:26:32 UTC (rev 3083)
+++ trunk/examples/simple/scripts/FAIBASE/30-interface	2005-11-23 12:32:57 UTC (rev 3084)
@@ -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