Bug#305783: fai: Including resolvconf (recommended by postfix) breaks FAI

[Michael Tautschnig]

Hello!

Could you please try the following patch? It should prevent FAI from copying
resolv.conf in case it is a symlink.

Thanks,
Michael


diff -rN -u old-MT_FAI/examples/simple/scripts/FAIBASE/30-interface 
new-MT_FAI/examples/simple/scripts/FAIBASE/30-interface
--- old-MT_FAI/examples/simple/scripts/FAIBASE/30-interface     2005-05-17 
15:01:05.000000000 +0200
+++ new-MT_FAI/examples/simple/scripts/FAIBASE/30-interface     2005-05-20 
16:56:42.000000000 +0200
@@ -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



diff -rN -u old-MT_FAI/examples/simple/scripts/FAIBASE/30-interface 
new-MT_FAI/examples/simple/scripts/FAIBASE/30-interface
--- old-MT_FAI/examples/simple/scripts/FAIBASE/30-interface     2005-05-17 
15:01:05.000000000 +0200
+++ new-MT_FAI/examples/simple/scripts/FAIBASE/30-interface     2005-05-20 
16:56:42.000000000 +0200
@@ -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