Merge lp:~allenap/maas/packaging.move-dhcp-helper-to-lib into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Move maas-dhcp-helper off PATH to /usr/lib/maas.

Goes with lp:~allenap/maas/move-dhcp-helper-to-lib.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Blake Rouse (blake-rouse)]

Again just thought of the reason this might be a problem. Check other branch for reason. A symlink might be needed in this branch and the apparmor conf would need to have both paths.

review: Needs Information

[Gavin Panella (allenap)]

Abandoning this. See https://code.launchpad.net/~allenap/maas/move-dhcp-helper-to-lib/+merge/321520 for discussion.

Unmerged revisions

552. By Gavin Panella on 2017-03-31

Move maas-dhcp-helper off PATH to /usr/lib/maas.

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-28 19:33:49 +0000
+++ debian/changelog	2017-03-31 08:10:23 +0000
@@ -3,6 +3,7 @@
   * New upstream release, MAAS 2.2.0 Beta 5.
   * debian/maas-common.logrotate: Rotate maas.log weekly, instead of daily.
     Store logs for 8 weeks. (LP: #1677005)
+  * Move maas-dhcp-helper off PATH to /usr/lib/maas.
 
  -- Andres Rodriguez <[e-mail]>  Tue, 28 Mar 2017 11:08:38 -0400
 

=== modified file 'debian/maas-dhcp.apparmor'
--- debian/maas-dhcp.apparmor	2016-03-29 20:32:33 +0000
+++ debian/maas-dhcp.apparmor	2017-03-31 08:10:23 +0000
@@ -6,5 +6,5 @@
 /var/lib/maas/dhcp/dhcpd*.leases* lrw,
 /var/lib/maas/dhcpd.conf r,
 /var/lib/maas/dhcpd6.conf r,
-/usr/sbin/maas-dhcp-helper Ux,
+/usr/lib/maas/maas-dhcp-helper Ux,
 /tmp/maas-dhcpd-* r,

=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	2016-03-22 17:07:45 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2017-03-31 08:10:23 +0000
@@ -18,7 +18,7 @@
     INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
     LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \
     [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
-    /usr/sbin/maas-dhcp-helper clean $LEASES_FILE; \
+    /usr/lib/maas/maas-dhcp-helper clean $LEASES_FILE; \
     chown root:dhcpd /var/lib/maas/dhcp $LEASES_FILE; \
     chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
     exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \

=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service	2016-04-22 23:27:40 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service	2017-03-31 08:10:23 +0000
@@ -18,7 +18,7 @@
     INTERFACES=$(cat /var/lib/maas/dhcpd6-interfaces); \
     LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \
     [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
-    /usr/sbin/maas-dhcp-helper clean $LEASES_FILE; \
+    /usr/lib/maas/maas-dhcp-helper clean $LEASES_FILE; \
     chown root:dhcpd /var/lib/maas/dhcp $LEASES_FILE; \
     chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
     exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \

=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install	2017-03-23 21:31:18 +0000
+++ debian/maas-rack-controller.install	2017-03-31 08:10:23 +0000
@@ -2,7 +2,7 @@
 debian/tmp/usr/bin/uec2roottar
 
 # Install maas-dhcp-helper
-debian/tmp/usr/sbin/maas-dhcp-helper
+debian/tmp/usr/lib/maas/maas-dhcp-helper
 
 # Install network monitoring scripts
 debian/tmp/usr/lib/maas/maas-network-monitor

=== modified file 'debian/maas-rack-controller.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides	2017-03-23 21:31:18 +0000
+++ debian/maas-rack-controller.lintian-overrides	2017-03-31 08:10:23 +0000
@@ -1,1 +1,1 @@
-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-dhcp-monitor
+maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/lib/maas/maas-dhcp-helper usr/lib/maas/maas-dhcp-monitor usr/lib/maas/maas-network-monitor