[debian-edu-commits] debian-edu/ 01/01: Fix domain-name settings for subnet00.intern and subnet01.intern. The invalid names caused ltsp clients to get a wrong /etc/resolv.conf generated by the ltsp init script ('search bad').

[Wolfgang Schweer]

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 0d0786c27b6cc24d1f833e12d96c4de41ee9a939
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Oct 2 21:53:26 2014 +0200

    Fix domain-name settings for subnet00.intern and subnet01.intern. The invalid names caused ltsp clients to get a wrong /etc/resolv.conf generated by the ltsp init script ('search bad').
---
 debian/changelog                | 8 ++++++++
 ldap-bootstrap/gosa-server.ldif | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 644dc14..c65d537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (1.807) UNRELEASED; urgency=high
+
+  * Fix domain-name settings for subnet00.intern and subnet01.intern.
+    The invalid names caused ltsp clients to get a wrong /etc/resolv.conf
+    generated by the ltsp init script ('search bad').
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 02 Oct 2014 21:40:29 +0200
+
 debian-edu-config (1.806) unstable; urgency=high
 
   [ Wolfgang Schweer ]
diff --git a/ldap-bootstrap/gosa-server.ldif b/ldap-bootstrap/gosa-server.ldif
index c53c5cc..46f5098 100644
--- a/ldap-bootstrap/gosa-server.ldif
+++ b/ldap-bootstrap/gosa-server.ldif
@@ -249,7 +249,7 @@ dhcpRange: 10.0.16.20 10.0.31.254
 # subnet00.intern shared network
 dn: cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
 dhcpOption: routers ltspserver00.subnet00
-dhcpOption: domain-name "intern subnet00.intern"
+dhcpOption: domain-name "intern"
 dhcpOption: subnet-mask 255.255.255.0
 dhcpOption: broadcast-address 192.168.0.255
 dhcpOption: root-path "/opt/ltsp/i386"
@@ -281,7 +281,7 @@ dhcpRange: 192.168.0.20 192.168.0.253
 # subnet01.intern shared network
 dn: cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
 dhcpOption: routers ltspserver01.subnet01
-dhcpOption: domain-name "intern subnet01.intern"
+dhcpOption: domain-name "intern"
 dhcpOption: subnet-mask 255.255.255.0
 dhcpOption: broadcast-address 192.168.1.255
 dhcpOption: root-path "/opt/ltsp/i386"

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