Merge lp:~allenap/maas/packaging.move-maas-delete-and-write-file-to-common into lp:~maas-maintainers/maas/packaging

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 549
Merged at revision: 548
Proposed branch: lp:~allenap/maas/packaging.move-maas-delete-and-write-file-to-common
Merge into: lp:~maas-maintainers/maas/packaging
Prerequisite: lp:~allenap/maas/packaging.restrict-maas-rack-sudo-rule
Diff against target: 57 lines (+8/-5)
6 files modified
debian/extras/99-maas-common-sudoers (+4/-0)
debian/extras/99-maas-sudoers (+0/-2)
debian/maas-common.install (+2/-0)
debian/maas-common.lintian-overrides (+1/-0)
debian/maas-rack-controller.install (+0/-2)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/packaging.move-maas-delete-and-write-file-to-common
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+320958@code.launchpad.net

Commit message

Move maas-delete-file and maas-write-file to maas-common.

Description of the change

This has been tested in Jenkins and comes up green: http://162.213.35.104:8080/job/maas-xenial-trunk-manual/350/

[Resubmitted because target branch was wrong.]

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
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-common-sudoers'
2--- debian/extras/99-maas-common-sudoers 2016-08-03 10:47:22 +0000
3+++ debian/extras/99-maas-common-sudoers 2017-03-24 16:33:37 +0000
4@@ -6,3 +6,7 @@
5 maas ALL= NOPASSWD: /bin/systemctl restart ntp
6 maas ALL= NOPASSWD: /bin/systemctl start ntp
7 maas ALL= NOPASSWD: /bin/systemctl status ntp
8+
9+# Writing and deleting files as root.
10+maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
11+maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
12
13=== modified file 'debian/extras/99-maas-sudoers'
14--- debian/extras/99-maas-sudoers 2017-03-23 09:01:58 +0000
15+++ debian/extras/99-maas-sudoers 2017-03-24 16:33:37 +0000
16@@ -12,6 +12,4 @@
17 maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
18 maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
19 maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
20-maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
21-maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
22 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
23
24=== modified file 'debian/maas-common.install'
25--- debian/maas-common.install 2016-06-10 18:57:41 +0000
26+++ debian/maas-common.install 2017-03-24 16:33:37 +0000
27@@ -1,2 +1,4 @@
28 debian/tmp/usr/share/maas/maas-rsyslog.conf
29 debian/extras/99-maas-common-sudoers etc/sudoers.d
30+debian/tmp/usr/lib/maas/maas-delete-file
31+debian/tmp/usr/lib/maas/maas-write-file
32
33=== added file 'debian/maas-common.lintian-overrides'
34--- debian/maas-common.lintian-overrides 1970-01-01 00:00:00 +0000
35+++ debian/maas-common.lintian-overrides 2017-03-24 16:33:37 +0000
36@@ -0,0 +1,1 @@
37+maas-common: binary-without-manpage usr/lib/maas/maas-delete-file usr/lib/maas/maas-write-file
38
39=== modified file 'debian/maas-rack-controller.install'
40--- debian/maas-rack-controller.install 2017-03-22 15:21:53 +0000
41+++ debian/maas-rack-controller.install 2017-03-24 16:33:37 +0000
42@@ -7,8 +7,6 @@
43 # Install network monitoring scripts
44 debian/tmp/usr/lib/maas/maas-network-monitor
45 debian/tmp/usr/lib/maas/maas-dhcp-monitor
46-debian/tmp/usr/lib/maas/maas-delete-file
47-debian/tmp/usr/lib/maas/maas-write-file
48
49 # Install all other stuff
50 debian/extras/99-maas-sudoers etc/sudoers.d
51
52=== modified file 'debian/maas-rack-controller.lintian-overrides'
53--- debian/maas-rack-controller.lintian-overrides 2017-03-22 15:21:53 +0000
54+++ debian/maas-rack-controller.lintian-overrides 2017-03-24 16:33:37 +0000
55@@ -1,1 +1,1 @@
56-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
57+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

Subscribers

People subscribed via source and target branches