Merge lp:~rvb/maas/packaging.bug-1085865 into lp:~maas-maintainers/maas/packaging

Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 155
Proposed branch: lp:~rvb/maas/packaging.bug-1085865
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 25 lines (+4/-0)
2 files modified
debian/changelog (+2/-0)
debian/maas-dns.postinst (+2/-0)
To merge this branch: bzr merge lp:~rvb/maas/packaging.bug-1085865
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+137644@code.launchpad.net

Commit message

Call write_dns_config in debian/maas-dns.postinst.

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

Don't forget to backport to packaging.quantal and packaging.precise.sru (you can just push a branch to the latter, no need to have an MP).

review: Approve

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 2012-11-28 20:47:37 +0000
3+++ debian/changelog 2012-12-03 17:53:31 +0000
4@@ -1,6 +1,8 @@
5 maas (0.1+bzr1366+dfsg-0ubuntu2) UNRELEASED; urgency=low
6
7 [ Raphaël Badin ]
8+ * debian/maas-dns.postinst: Call write_dns_config.
9+ (LP: #1085865).
10 * debian/maas-cluster-controller.postinst: Fix the name of the config
11 file (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf)
12 (LP: #1083542).
13
14=== modified file 'debian/maas-dns.postinst'
15--- debian/maas-dns.postinst 2012-10-19 15:42:58 +0000
16+++ debian/maas-dns.postinst 2012-12-03 17:53:31 +0000
17@@ -26,6 +26,8 @@
18 sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
19 maas get_named_conf --edit --config_path /etc/bind/named.conf.local
20
21+ maas write_dns_config
22+
23 if [ -x /usr/sbin/invoke-rc.d ]; then
24 invoke-rc.d bind9 restart || true
25 fi

Subscribers

People subscribed via source and target branches