Merge lp:~blake-rouse/maas/fix-1559398-packaging into lp:~maas-maintainers/maas/packaging

Proposed by Blake Rouse on 2016-03-21
Status: Merged
Approved by: Blake Rouse on 2016-03-22
Approved revision: 466
Merged at revision: 464
Proposed branch: lp:~blake-rouse/maas/fix-1559398-packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 63 lines (+11/-7)
5 files modified
debian/maas-dhcp.apparmor (+1/-1)
debian/maas-dhcp.maas-dhcpd.service (+3/-2)
debian/maas-dhcp.maas-dhcpd6.service (+3/-3)
debian/maas-rack-controller.install (+3/-0)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1559398-packaging
Reviewer Review Type Date Requested Status
Mike Pontillo (community) 2016-03-21 Approve on 2016-03-21
Review via email: mp+289713@code.launchpad.net

Commit message

Packaging change that is required to fix bug 1559398. Allows dhcpd to run maas-dhcp-notify and installs that command into /usr/sbin.

Description of the change

To post a comment you must log in.
Mike Pontillo (mpontillo) wrote :

Approved with the reservations noted in the other MP.[1]

[1]: https://code.launchpad.net/~blake-rouse/maas/fix-1559398/+merge/289712

review: Approve
466. By Blake Rouse on 2016-03-22

Use maas-dhcp-helper.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-dhcp.apparmor'
2--- debian/maas-dhcp.apparmor 2016-03-17 18:22:04 +0000
3+++ debian/maas-dhcp.apparmor 2016-03-22 17:08:10 +0000
4@@ -6,4 +6,4 @@
5 /var/lib/maas/dhcp/dhcpd*.leases* lrw,
6 /var/lib/maas/dhcpd.conf r,
7 /var/lib/maas/dhcpd6.conf r,
8-/usr/sbin/maas-rack Ux,
9+/usr/sbin/maas-dhcp-helper Ux,
10
11=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
12--- debian/maas-dhcp.maas-dhcpd.service 2016-03-17 18:59:22 +0000
13+++ debian/maas-dhcp.maas-dhcpd.service 2016-03-22 17:08:10 +0000
14@@ -18,8 +18,9 @@
15 INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
16 LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \
17 [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
18- chown root:dhcpd /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \
19- chmod 775 /var/lib/maas/dhcp ; chmod 664 /var/lib/maas/dhcp/dhcpd.leases; \
20+ /usr/sbin/maas-dhcp-helper clean $LEASES_FILE; \
21+ chown root:dhcpd /var/lib/maas/dhcp $LEASES_FILE; \
22+ chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
23 exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \
24 -cf /var/lib/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES'
25
26
27=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
28--- debian/maas-dhcp.maas-dhcpd6.service 2016-03-17 18:59:22 +0000
29+++ debian/maas-dhcp.maas-dhcpd6.service 2016-03-22 17:08:10 +0000
30@@ -18,9 +18,9 @@
31 INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
32 LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \
33 [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
34- chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases*; \
35- chown root:dhcpd /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases; \
36- chmod 775 /var/lib/maas/dhcp ; chmod 664 /var/lib/maas/dhcp/dhcpd6.leases; \
37+ /usr/sbin/maas-dhcp-helper clean $LEASES_FILE; \
38+ chown root:dhcpd /var/lib/maas/dhcp $LEASES_FILE; \
39+ chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
40 exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \
41 -cf /var/lib/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES'
42
43
44=== modified file 'debian/maas-rack-controller.install'
45--- debian/maas-rack-controller.install 2016-03-07 22:01:56 +0000
46+++ debian/maas-rack-controller.install 2016-03-22 17:08:10 +0000
47@@ -7,6 +7,9 @@
48 # Install uec2roottar
49 debian/tmp/usr/bin/uec2roottar
50
51+# Install maas-dhcp-helper
52+debian/tmp/usr/sbin/maas-dhcp-helper
53+
54 # Install all other stuff
55 debian/extras/99-maas-sudoers etc/sudoers.d
56 debian/extras/maas-probe-dhcp usr/sbin
57
58=== modified file 'debian/maas-rack-controller.lintian-overrides'
59--- debian/maas-rack-controller.lintian-overrides 2016-02-04 10:08:48 +0000
60+++ debian/maas-rack-controller.lintian-overrides 2016-03-22 17:08:10 +0000
61@@ -1,1 +1,1 @@
62-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar
63+maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper

Subscribers

People subscribed via source and target branches