Merge lp:~andreserl/maas/lp1570911 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

debian/maas-dhcp.posinst: Pipe error messages correctly to not show messages when disabling isc-dhcp-server init scripts. (LP: #1570911)

[Andres Rodriguez (andreserl)]

lamont reviewed over irc.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-10 17:36:31 +0000
+++ debian/changelog	2016-05-13 15:18:35 +0000
@@ -1,6 +1,8 @@
-maas (2.0.0~beta5+bzr4999-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~beta5+bzr5019-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New upstream release, 2.0.0 beta 5 bzr:
+  * debian/maas-dhcp.posinst: Pipe error messages correctly to not show
+    messages when disabling isc-dhcp-server init scripts. (LP: #1570911)
 
  -- Andres Rodriguez <[e-mail]>  Fri, 06 May 2016 09:56:40 -0500
 

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2016-03-31 23:55:39 +0000
+++ debian/maas-dhcp.postinst	2016-05-13 15:18:35 +0000
@@ -6,10 +6,10 @@
 then
     # Stop the dhcpd instance that came with the isc-dhcp-server package.
     # We run our own dhcpd instances.
-    systemctl stop isc-dhcp-server >/dev/null || true
-    systemctl disable isc-dhcp-server >/dev/null || true
-    systemctl stop isc-dhcp-server6 >/dev/null || true
-    systemctl disable isc-dhcp-server6 >/dev/null || true
+    systemctl stop isc-dhcp-server >/dev/null 2>&1 || true
+    systemctl disable isc-dhcp-server >/dev/null 2>&1 || true
+    systemctl stop isc-dhcp-server6 >/dev/null 2>&1 || true
+    systemctl disable isc-dhcp-server6 >/dev/null 2>&1 || true
 
     dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
     if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1