[debian-edu-commits] debian-edu/ 01/01: Adjust share/debian-edu-config/d-i/pre-pkgsel:
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Thu May 17 15:48:53 BST 2018
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-config.
commit add3ca274ce84894df984e548ebf98953391818d
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Thu May 17 16:45:49 2018 +0200
Adjust share/debian-edu-config/d-i/pre-pkgsel:
Leave network configuration to NetworkManager also on workstations.
This should ensure that NetworkManager.wait-online.service works like
expected. Thanks to Mike Gabriel. (Closes: #887861)
---
debian/changelog | 4 ++++
share/debian-edu-config/d-i/pre-pkgsel | 10 ++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 36a23bb..2d93852 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
debian-edu-config (2.10.27) UNRELEASED; urgency=medium
+ * share/debian-edu-config/d-i/pre-pkgsel:
+ - Leave network configuration to NetworkManager also on workstations.
+ This should ensure that NetworkManager.wait-online.service works like
+ expected. Thanks to Mike Gabriel. (Closes: #887861)
* cf3/cf.finalize: Move shell command for networked desktops into own file
cf3/cf.desktop-networked.
* cf3/promises.cf: Include cf.desktop-networked at an early execution stage.
diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index b17aa1b..53c9899 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -85,8 +85,10 @@ EOF
Workstation)
# Use this unless Server also was choosen.
if [ -z "$eth0" ] ; then
- eth0=dhcp
- autoeth0="auto eth0"
+ eth0=none
+ autoeth0=""
+ eth1=none
+ autoeth1=""
fi
;;
Main-Server)
@@ -99,8 +101,8 @@ EOF
LTSP-Server)
# Use this unless Server also was choosen.
if [ -z "$eth0" ] ; then
- eth0=dhcp
- autoeth0="auto eth0"
+ eth0=none
+ autoeth0=""
fi
eth1=192.168.0.254:255.255.255.0:192.168.0.255:none
autoeth1="auto eth1"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list