[debian-edu-commits] debian-edu/ 01/01: Change default network configuration for Roaming Workstation to tell network manager to activate eth0 by default. This is needed to get LDAP and Kerberos access when registering the initial user. Depend on uuid to be able to generate an UUID for the eth0 configuration for network manager.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit d7cd58a85535c0c87c17301cc221aaeb812e7cb1
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Aug 23 14:26:55 2014 +0200

    Change default network configuration for Roaming Workstation to tell network manager to activate eth0 by default.  This is needed to get LDAP and Kerberos access when registering the initial user.  Depend on uuid to be able to generate an UUID for the eth0 configuration for network manager.
---
 debian/changelog                       |  5 +++++
 debian/control                         |  2 +-
 share/debian-edu-config/d-i/pre-pkgsel | 31 +++++++++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 323223b..88dc584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ debian-edu-config (1.721) UNRELEASED; urgency=low
     - Add new Portuguese translation done by Américo Monteiro (Closes: 757532).
   * Drop unused python-support build dependency.  Depend directly on
     python instead for /etc/ltspfs/mounter.d/edu-notify.
+  * Change default network configuration for Roaming Workstation to tell
+    network manager to activate eth0 by default.  This is needed to get
+    LDAP and Kerberos access when registering the initial user.  Depend
+    on uuid to be able to generate an UUID for the eth0 configuration
+    for network manager.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 23 Aug 2014 10:47:02 +0200
 
diff --git a/debian/control b/debian/control
index 1bd3697..dd98676 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Package: debian-edu-config
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, debconf-utils, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, lsb-release, ssl-cert, openssl, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, discover, tftp | tftp-hpa, debian-edu-artwork, education-tasks (>= 0.853), net-tools, patch, base-files (>= 5.3), python, python-notify, libterm-readkey-perl, fping, ldap-utils, libnet-netmask-perl, smbldap-tools (>= 0 [...]
-Recommends: resolvconf, ddccontrol | xresprobe, syslinux, memtest86+, libnotify-bin, lsof, binutils
+Recommends: resolvconf, ddccontrol | xresprobe, syslinux, memtest86+, libnotify-bin, lsof, binutils, uuid
 Suggests: atftpd | tftpd-hpa
 Breaks: nslcd (<< 0.7.7), dhcp3-client (<< 4.1.1-P1-9), dhcp3-server (<< 4.1.1-P1-9), slapd (<< 2.4.23-5), debian-edu-install (<< 1.521~svn74617)
 Description: Configuration files for Skolelinux systems
diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index 19d6cde..2eb2848 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -67,9 +67,36 @@ configure_network() {
     # server config for eth0.
     for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
 	case $value in
-	    Standalone|Roaming-Workstation)
+	    Roaming-Workstation)
+		# Configure network-manager to connect to eth0 by
+		# default, to be able to look up user information in
+		# LDAP.
+		eth0=none
+		autoeth0=""
+		eth1=none
+		autoeth1=""
+		RUNXSERVER=true
+		DNSDOMAIN=
+		MAILNAME=
+		HOSTNAME=
+		eth0uuid=$(uuid)
+		mkdir -p /target/etc/NetworkManager/system-connections
+		cat > /target/etc/NetworkManager/system-connections/eth0 <<EOF
+[connection]
+id=eth0
+uuid=$eth0uuid
+type=ethernet
+
+[ipv6]
+method=auto
+
+[ipv4]
+method=auto
+EOF
+		;;
+	    Standalone)
  	        # Leave network configuration to network-manager on
- 	        # Standalone and Roaming-Workstation
+ 	        # Standalone
 		eth0=none
 		autoeth0=""
 		eth1=none

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git