Merge lp:~mikemc/maas/packaging.utopic-backport-1346538 into lp:~maas-maintainers/maas/packaging.utopic

[Mike McCracken]

- backport fix for LP: #1346538 to utopic packaging branch

- backport fix for LP: #1346538 to utopic packaging branch

[Julian Edwards (julian-edwards)]

Thanks, approved with one nit!

review: Approve

[lp:~mikemc/maas/packaging.utopic-backport-1346538]

333. By Mike McCracken on 2014-10-21

fix distro

[Mike McCracken (mikemc)]

updated as per comment

[Christian Reis (kiko)]

Does the "inside.maas" portion of the pathname ever change?

[Mike McCracken (mikemc)]

kiko: it doesn't look like it. it's defined as
MAAS_NAMED_CONF_OPTIONS_INSIDE_NAME in provisioningserver.dns.config, and
it's added to the named.conf.options file by the edit_named_options django
command.

On Tue, Oct 21, 2014 at 11:31 AM, Christian Reis <email address hidden> wrote:

> Does the "inside.maas" portion of the pathname ever change?
> --
>
> https://code.launchpad.net/~mikemc/maas/packaging.utopic-backport-1346538/+merge/238995
> You are the owner of lp:~mikemc/maas/packaging.utopic-backport-1346538.
>

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-20 19:09:19 +0000
+++ debian/changelog	2014-10-21 15:22:18 +0000
@@ -1,8 +1,10 @@
-maas (1.7.0~beta7+bzr3267-0ubuntu1) UNRELEASED; urgency=medium
-
-  * UNRELEASED
-
- -- Andres Rodriguez <[e-mail]>  Mon, 20 Oct 2014 15:01:20 -0400
+maas (1.7.0~beta7+bzr3267-0ubuntu2) utopic; urgency=medium
+
+  [ Michael McCracken ]
+  * debian/maas-dns.postrm: ensure named.conf is cleaned of maas
+    includes (LP: #1346538)
+
+ -- Michael McCracken <[e-mail]>  Mon, 20 Oct 2014 15:32:22 -0700
 
 maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium
 
 
=== modified file 'debian/maas-dns.postrm'
--- debian/maas-dns.postrm	2013-03-19 19:46:23 +0000
+++ debian/maas-dns.postrm	2014-10-21 15:22:18 +0000
@@ -6,6 +6,8 @@
 	if [ -f /etc/bind/named.conf.local ]; then
 		sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \
 			/etc/bind/named.conf.local
+		sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.options.inside.maas\"\;$/d' \
+			/etc/bind/named.conf.options
 	fi
 fi