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

Proposed by Mike McCracken
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 333
Merged at revision: 331
Proposed branch: lp:~mikemc/maas/packaging.utopic-backport-1346538
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 31 lines (+9/-5)
2 files modified
debian/changelog (+7/-5)
debian/maas-dns.postrm (+2/-0)
To merge this branch: bzr merge lp:~mikemc/maas/packaging.utopic-backport-1346538
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+238995@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Thanks, approved with one nit!

review: Approve
333. By Mike McCracken

fix distro

Revision history for this message
Mike McCracken (mikemc) wrote :

updated as per comment

Revision history for this message
Christian Reis (kiko) wrote :

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

Revision history for this message
Mike McCracken (mikemc) wrote :

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.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-10-20 19:09:19 +0000
3+++ debian/changelog 2014-10-21 15:22:18 +0000
4@@ -1,8 +1,10 @@
5-maas (1.7.0~beta7+bzr3267-0ubuntu1) UNRELEASED; urgency=medium
6-
7- * UNRELEASED
8-
9- -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 20 Oct 2014 15:01:20 -0400
10+maas (1.7.0~beta7+bzr3267-0ubuntu2) utopic; urgency=medium
11+
12+ [ Michael McCracken ]
13+ * debian/maas-dns.postrm: ensure named.conf is cleaned of maas
14+ includes (LP: #1346538)
15+
16+ -- Michael McCracken <mike.mccracken@canonical.com> Mon, 20 Oct 2014 15:32:22 -0700
17
18 maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium
19
20
21=== modified file 'debian/maas-dns.postrm'
22--- debian/maas-dns.postrm 2013-03-19 19:46:23 +0000
23+++ debian/maas-dns.postrm 2014-10-21 15:22:18 +0000
24@@ -6,6 +6,8 @@
25 if [ -f /etc/bind/named.conf.local ]; then
26 sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \
27 /etc/bind/named.conf.local
28+ sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.options.inside.maas\"\;$/d' \
29+ /etc/bind/named.conf.options
30 fi
31 fi
32

Subscribers

People subscribed via source and target branches

to all changes: