[debian-edu-commits] r80627 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-14 09:39:22 +0000 (Fri, 14 Jun 2013)
New Revision: 80627

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
Log:
Teach sssd-generate-config and setup-ad-client to ignore the output
from 'hostname -d' when it is '(null)'.  This make the scripts more
robust.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-14 09:09:41 UTC (rev 80626)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-14 09:39:22 UTC (rev 80627)
@@ -1,3 +1,12 @@
+debian-edu-config (1.707~svn80618) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Teach sssd-generate-config and setup-ad-client to ignore the output
+    from 'hostname -d' when it is '(null)'.  This make the scripts more
+    robust.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 14 Jun 2013 11:38:56 +0200
+
 debian-edu-config (1.707~svn80617) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client	2013-06-14 09:09:41 UTC (rev 80626)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client	2013-06-14 09:39:22 UTC (rev 80627)
@@ -26,7 +26,7 @@
 	domain="$(hostname -d 2>/dev/null || true)"
 	# If hostname is not FQDN, look in DNS setup instead, to
 	# increase the chance of the automatic setup to work.
-	if [ -z "$domain" ] ; then
+	if [ -z "$domain" ] || [ "(null)" = "$domain" ]; then
 	    domain=$(grep search /etc/resolv.conf |awk '{print $2}')
 	fi
     fi

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2013-06-14 09:09:41 UTC (rev 80626)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2013-06-14 09:39:22 UTC (rev 80627)
@@ -85,7 +85,7 @@
 	domain="$(hostname -d 2>/dev/null || true)"
 	# If hostname is not FQDN, look in DNS setup instead, to
 	# increase the chance of the automatic setup to work.
-	if [ -z "$domain" ] ; then
+	if [ -z "$domain" ] || [ "(null)" = "$domain" ]; then
 	    domain=$(grep search /etc/resolv.conf |awk '{print $2}')
 	fi
     fi