MAAS

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

  1. fix-1559398-packaging
  2. Merge into packaging
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
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) Approve
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

Required with other MP: https://code.launchpad.net/~blake-rouse/maas/fix-1559398/+merge/289712

To post a comment you must log in.
Revision history for this message
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/maas-dhcp.apparmor'
--- debian/maas-dhcp.apparmor 2016-03-17 18:22:04 +0000
+++ debian/maas-dhcp.apparmor 2016-03-22 17:08:10 +0000
@@ -6,4 +6,4 @@
6/var/lib/maas/dhcp/dhcpd*.leases* lrw,6/var/lib/maas/dhcp/dhcpd*.leases* lrw,
7/var/lib/maas/dhcpd.conf r,7/var/lib/maas/dhcpd.conf r,
8/var/lib/maas/dhcpd6.conf r,8/var/lib/maas/dhcpd6.conf r,
9/usr/sbin/maas-rack Ux,9/usr/sbin/maas-dhcp-helper Ux,
1010
=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service 2016-03-17 18:59:22 +0000
+++ debian/maas-dhcp.maas-dhcpd.service 2016-03-22 17:08:10 +0000
@@ -18,8 +18,9 @@
18 INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \18 INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
19 LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \19 LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \
20 [ -e $LEASES_FILE ] || touch $LEASES_FILE; \20 [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
21 chown root:dhcpd /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \21 /usr/sbin/maas-dhcp-helper clean $LEASES_FILE; \
22 chmod 775 /var/lib/maas/dhcp ; chmod 664 /var/lib/maas/dhcp/dhcpd.leases; \22 chown root:dhcpd /var/lib/maas/dhcp $LEASES_FILE; \
23 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 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 -cf /var/lib/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES'
2526
2627
=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service 2016-03-17 18:59:22 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service 2016-03-22 17:08:10 +0000
@@ -18,9 +18,9 @@
18 INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \18 INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
19 LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \19 LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \
20 [ -e $LEASES_FILE ] || touch $LEASES_FILE; \20 [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
21 chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases*; \21 /usr/sbin/maas-dhcp-helper clean $LEASES_FILE; \
22 chown root:dhcpd /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases; \22 chown root:dhcpd /var/lib/maas/dhcp $LEASES_FILE; \
23 chmod 775 /var/lib/maas/dhcp ; chmod 664 /var/lib/maas/dhcp/dhcpd6.leases; \23 chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
24 exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \24 exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \
25 -cf /var/lib/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES'25 -cf /var/lib/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES'
2626
2727
=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install 2016-03-07 22:01:56 +0000
+++ debian/maas-rack-controller.install 2016-03-22 17:08:10 +0000
@@ -7,6 +7,9 @@
7# Install uec2roottar7# Install uec2roottar
8debian/tmp/usr/bin/uec2roottar8debian/tmp/usr/bin/uec2roottar
99
10# Install maas-dhcp-helper
11debian/tmp/usr/sbin/maas-dhcp-helper
12
10# Install all other stuff13# Install all other stuff
11debian/extras/99-maas-sudoers etc/sudoers.d14debian/extras/99-maas-sudoers etc/sudoers.d
12debian/extras/maas-probe-dhcp usr/sbin15debian/extras/maas-probe-dhcp usr/sbin
1316
=== modified file 'debian/maas-rack-controller.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides 2016-02-04 10:08:48 +0000
+++ debian/maas-rack-controller.lintian-overrides 2016-03-22 17:08:10 +0000
@@ -1,1 +1,1 @@
1maas-rack-controller: binary-without-manpage usr/bin/uec2roottar1maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper

Subscribers

People subscribed via source and target branches