X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=scripts%2FFAIBASE%2F30-interface;h=6f6eeafa936a9716f2d9ae3266db64db19b6c628;hp=783867f3adaca523aa7634dfa5220f5475508bef;hb=f854157b2cc7ba3436b9f0081a620a1120401b17;hpb=2d1f80141012c71750cb16bb6d16f48f4ea53a45

diff --git a/scripts/FAIBASE/30-interface b/scripts/FAIBASE/30-interface
index 783867f..6f6eeaf 100755
--- a/scripts/FAIBASE/30-interface
+++ b/scripts/FAIBASE/30-interface
@@ -1,34 +1,33 @@
 #! /bin/bash
 
-error=0 ; trap "error=$((error|1))" ERR
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-if ifclass DHCPC && [ $FAI_ACTION != "softupdate" ]
+if ifclass DHCPC && [ $FAI_ACTION = "dirinstall" ]
 then
     cat > $target/etc/network/interfaces <<-EOF
 	# generated by FAI
-	auto lo eth0
+	auto lo $NIC1
 	iface lo inet loopback
-	iface eth0 inet dhcp
+	iface $NIC1 inet dhcp
 EOF
-elif [ $FAI_ACTION != "softupdate" ]
+elif [ $FAI_ACTION = "dirinstall" ]
 then
       [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
 	# generated by FAI
-	auto lo eth0
+	auto lo $NIC1
 	iface lo inet loopback
-	iface eth0 inet static
+	iface $NIC1 inet static
 	  address $IPADDR
 	  netmask $NETMASK
-	  broadcast $BROADCAST
 	  gateway $GATEWAYS
 EOF
     [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
-    [ -s /etc/resolv.conf ] && cp -p /etc/resolv.conf $target/etc
+    [ -L $target/etc/resolv.conf ] || cp -p /etc/resolv.conf $target/etc
 fi
 
 # here fcopy is mostly used, when installing a client for running in a
-# different subnet than during the installation  
-fcopy -i /etc/resolv.conf
+# different subnet than during the installation
+fcopy -iM /etc/resolv.conf
 fcopy -iM /etc/network/interfaces /etc/networks
 
 exit $error