[debian-edu-commits] r78961 - in branches/wheezy/debian-edu-install: . debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-02-02 16:08:55 +0000 (Sat, 02 Feb 2013)
New Revision: 78961

Modified:
   branches/wheezy/debian-edu-install/debian/changelog
   branches/wheezy/debian-edu-install/finish-install
Log:
Remove code added Wolfgang Schweer to finish-install in version
1.702.  It is moved to debian-edu-config where it belong.

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-02-02 15:32:59 UTC (rev 78960)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-02-02 16:08:55 UTC (rev 78961)
@@ -1,3 +1,11 @@
+debian-edu-install (1.705) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Remove code added Wolfgang Schweer to finish-install in version
+    1.702.  It is moved to debian-edu-config where it belong.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 02 Feb 2013 17:06:57 +0100
+
 debian-edu-install (1.704) unstable; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-install/finish-install
===================================================================
--- branches/wheezy/debian-edu-install/finish-install	2013-02-02 15:32:59 UTC (rev 78960)
+++ branches/wheezy/debian-edu-install/finish-install	2013-02-02 16:08:55 UTC (rev 78961)
@@ -1,6 +1,10 @@
 #! /bin/sh -e
 #
 # Last finishing touch before rebooting into the installed system.
+#
+# Try to avoid adding new code here.  Please put it in
+# debian-edu-config in the
+# /usr/share/debian-edu-config/d-i/finish-install script instead.
 
 . /usr/share/debconf/confmodule
 . /lib/debian-edu-common
@@ -27,11 +31,4 @@
     error "Unable to find $hook"
 fi
 
-# Prevent d-i to delete configured target interface file
-file=/usr/lib/finish-install.d/55netcfg-copy-config
-if [ -x $file ] ; then
-    log "Keep already configured interface file"
-    cat /dev/null > $file
-fi
-
 exit 0