Merge lp:~allenap/maas/packaging.atomic-delete-and-write-scripts into lp:~maas-maintainers/maas/packaging

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 546
Merged at revision: 546
Proposed branch: lp:~allenap/maas/packaging.atomic-delete-and-write-scripts
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 30 lines (+5/-1)
3 files modified
debian/extras/99-maas-sudoers (+2/-0)
debian/maas-rack-controller.install (+2/-0)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/packaging.atomic-delete-and-write-scripts
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+320677@code.launchpad.net

Commit message

Install new scripts maas-delete-file and maas-write-file to /usr/lib/maas.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/extras/99-maas-sudoers'
2--- debian/extras/99-maas-sudoers 2016-07-18 23:32:56 +0000
3+++ debian/extras/99-maas-sudoers 2017-03-22 17:01:21 +0000
4@@ -12,4 +12,6 @@
5 maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
6 maas ALL= NOPASSWD: /usr/sbin/maas-rack
7 maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
8+maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
9+maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
10 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
11
12=== modified file 'debian/maas-rack-controller.install'
13--- debian/maas-rack-controller.install 2016-10-05 05:51:15 +0000
14+++ debian/maas-rack-controller.install 2017-03-22 17:01:21 +0000
15@@ -7,6 +7,8 @@
16 # Install network monitoring scripts
17 debian/tmp/usr/lib/maas/maas-network-monitor
18 debian/tmp/usr/lib/maas/maas-dhcp-monitor
19+debian/tmp/usr/lib/maas/maas-delete-file
20+debian/tmp/usr/lib/maas/maas-write-file
21
22 # Install all other stuff
23 debian/extras/99-maas-sudoers etc/sudoers.d
24
25=== modified file 'debian/maas-rack-controller.lintian-overrides'
26--- debian/maas-rack-controller.lintian-overrides 2016-10-05 05:44:25 +0000
27+++ debian/maas-rack-controller.lintian-overrides 2017-03-22 17:01:21 +0000
28@@ -1,1 +1,1 @@
29-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
30+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 usr/lib/maas/maas-delete-file usr/lib/maas/maas-write-file

Subscribers

People subscribed via source and target branches