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

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-06 10:22:01 +0000 (Sat, 06 Jul 2013)
New Revision: 81394

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel
Log:
Adjust network setup for Standalone and Roaming-Workstation to
work with Network Manager in Wheezy, which ignore all interfaces
listed in /etc/network/interfaces.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-06 04:47:33 UTC (rev 81393)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-06 10:22:01 UTC (rev 81394)
@@ -1,3 +1,12 @@
+debian-edu-config (1.708~svn81384) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Adjust network setup for Standalone and Roaming-Workstation to
+    work with Network Manager in Wheezy, which ignore all interfaces
+    listed in /etc/network/interfaces.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 06 Jul 2013 12:20:36 +0200
+
 debian-edu-config (1.708~svn81383) wheezy-test; urgency=low
 
   [ Holger Levsen ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel	2013-07-06 04:47:33 UTC (rev 81393)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel	2013-07-06 10:22:01 UTC (rev 81394)
@@ -68,11 +68,12 @@
     for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
 	case $value in
 	    Standalone|Roaming-Workstation)
- 	        # Leave network configuration to network-manager on Standalone and Roaming-Workstation
-		eth0=dhcp
-		autoeth0="allow-hotplug eth0"
-		eth1=dhcp
-		autoeth1="allow-hotplug eth1"
+ 	        # Leave network configuration to network-manager on
+ 	        # Standalone and Roaming-Workstation
+		eth0=none
+		autoeth0=""
+		eth1=none
+		autoeth1=""
 		RUNXSERVER=true
 		DNSDOMAIN=
 		MAILNAME=