[debian-edu-commits] r78955 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/d-i

[pere at alioth.debian.org]

Author: pere
Date: 2013-02-02 15:08:28 +0000 (Sat, 02 Feb 2013)
New Revision: 78955

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install
Log:
Insert code fixing the network setup during installation written
by Wolfgang Schweer in debian-edu-install to the
/usr/share/debian-edu-config/d-i/finish-install file where it
belong.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-02-02 09:02:59 UTC (rev 78954)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-02-02 15:08:28 UTC (rev 78955)
@@ -1,9 +1,16 @@
 debian-edu-config (1.703~svn78931+nmu1) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * Add nameserver entry in main-server network interfaces file
     to get at least one nameserver entry for resolvconf.
   * Add cf.ldap2zone to cfengine config file.
 
+  [ Petter Reinholdtsen ]
+  * Insert code fixing the network setup during installation written
+    by Wolfgang Schweer in debian-edu-install to the
+    /usr/share/debian-edu-config/d-i/finish-install file where it
+    belong.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 01 Feb 2013 18:26:25 +0100
 
 debian-edu-config (1.703~svn78931) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install	2013-02-02 09:02:59 UTC (rev 78954)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install	2013-02-02 15:08:28 UTC (rev 78955)
@@ -37,6 +37,15 @@
     fi
 }
 
+# Prevent d-i to delete configured target interface file
+preserve_network_interfaces() {
+    file=/usr/lib/finish-install.d/55netcfg-copy-config
+    if [ -x $file ] ; then
+	log "Keep already configured interface file"
+	cat /dev/null > $file
+    fi
+}
+
 # Register changes before and after cfengine is executed, to make it
 # easier to track our changes
 edu-etcvcs commit
@@ -76,6 +85,7 @@
 edu-etcvcs commit
 
 remove_tasksel_overrides
+preserve_network_interfaces
 deconfigure_network
 
 edu-etcvcs commit