[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 585086bd39c108e7451fc509b71949f8d9ca3177

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit bba86ae9db96d5043db0f326403ef2f282366d66
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Thu Apr 5 19:38:46 2012 +0200

    Do not overwrite the network configuration on softupdate; typo.
    
    If /etc/network/interfaces or /etc/resolv.conf have been modified from
    the default, there are probably justified reasons.  For example, the
    external interface might use a static address instead of DHCP.  Do not
    overwrite these modifications on a fai softupdate.

diff --git a/fai/config/package_config/DEVTOOLS b/fai/config/package_config/DEVTOOLS
index 6e1730b..87a5257 100644
--- a/fai/config/package_config/DEVTOOLS
+++ b/fai/config/package_config/DEVTOOLS
@@ -6,7 +6,7 @@ git
 gitk
 
 ## Diagnostics:
-gbd
+gdb
 lsof
 ltrace
 nmap
diff --git a/fai/config/scripts/FAIBASE/30-interface b/fai/config/scripts/FAIBASE/30-interface
index 8c6e175..d327f79 100755
--- a/fai/config/scripts/FAIBASE/30-interface
+++ b/fai/config/scripts/FAIBASE/30-interface
@@ -28,8 +28,8 @@ 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
-fcopy -iM /etc/network/interfaces /etc/networks
+# different subnet than during the installation
+fcopy -iU /etc/resolv.conf
+fcopy -iUM /etc/network/interfaces /etc/networks
 
 exit $error

-- 
Debian-LAN development and packaging