MAAS

Merge lp:~julian-edwards/maas/packaging-add-maas-probe-dhcp into lp:~maas-maintainers/maas/packaging

  1. packaging-add-maas-probe-dhcp
  2. Merge into packaging
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 219
Merged at revision: 219
Proposed branch: lp:~julian-edwards/maas/packaging-add-maas-probe-dhcp
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 43 lines (+15/-1)
4 files modified
debian/changelog (+6/-1)
debian/extras/maas-probe-dhcp (+7/-0)
debian/maas-dhcp.install (+1/-0)
debian/maas-dhcp.lintian-overrides (+1/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging-add-maas-probe-dhcp
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+201538@code.launchpad.net

Commit message

Add maas-probe-dhcp binary to /usr/sbin

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Thanks! The wrapper in "extras" is the part I missed.

The "1>&2" struck me as more than necessary (normally I'd use just ">&2" for this) but on reflection it's just being explicit, which is fine.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Tested on Canonistack OK.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-01-13 13:28:58 +0000
3+++ debian/changelog 2014-01-14 05:12:05 +0000
4@@ -7,8 +7,13 @@
5 celery jobs.
6 * debian/maas-region-controller.templates: Rename template to
7 maas-region-controller-min.templates
8+ [ Julian Edwards ]
9+ * New maas-probe-dhcp script to detect DHCP servers
10+ - debian/extras/maas-probe-dhcp: New script
11+ - debian/maas-dhcp.install: Install new maas-probe-dhcp script
12+ - maas-dhcp.lintian-overrides: New maas-probe-dhcp script has no manpage
13
14- -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 24 Dec 2013 14:07:14 -0500
15+ -- Julian Edwards <julian.edwards@canonical.com> Tue, 14 Jan 2014 15:05:22 +1000
16
17 maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low
18
19
20=== added file 'debian/extras/maas-probe-dhcp'
21--- debian/extras/maas-probe-dhcp 1970-01-01 00:00:00 +0000
22+++ debian/extras/maas-probe-dhcp 2014-01-14 05:12:05 +0000
23@@ -0,0 +1,7 @@
24+#!/bin/sh
25+if [ "$(id -u)" != "0" ]; then
26+ echo "This utility may only be run as root." 1>&2
27+ exit 1
28+fi
29+export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
30+exec /usr/bin/python -m provisioningserver/dhcp/probe "$@"
31
32=== modified file 'debian/maas-dhcp.install'
33--- debian/maas-dhcp.install 2012-09-13 00:20:44 +0000
34+++ debian/maas-dhcp.install 2014-01-14 05:12:05 +0000
35@@ -1,1 +1,2 @@
36 /debian/tmp/etc/apparmor.d/dhcpd.d/maas
37+debian/extras/maas-probe-dhcp usr/sbin
38
39=== added file 'debian/maas-dhcp.lintian-overrides'
40--- debian/maas-dhcp.lintian-overrides 1970-01-01 00:00:00 +0000
41+++ debian/maas-dhcp.lintian-overrides 2014-01-14 05:12:05 +0000
42@@ -0,0 +1,1 @@
43+maas-dhcp: binary-without-manpage usr/bin/maas-probe-dhcp

Subscribers

People subscribed via source and target branches