Ubuntu
isc-dhcp package

Merge lp:~smoser/ubuntu/quantal/isc-dhcp/maas-lp1049177 into lp:ubuntu/quantal/isc-dhcp

  1. Quantal (12.10)
  2. maas-lp1049177
  3. Merge into quantal
Proposed by Scott Moser on 2012-09-11
Status: Merged
Merged at revision: 58
Proposed branch: lp:~smoser/ubuntu/quantal/isc-dhcp/maas-lp1049177
Merge into: lp:ubuntu/quantal/isc-dhcp
Diff against target: 48 lines (+12/-0)
4 files modified
debian/apparmor-profile.dhcpd (+3/-0)
debian/changelog (+7/-0)
debian/isc-dhcp-server.install (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~smoser/ubuntu/quantal/isc-dhcp/maas-lp1049177
Reviewer Review Type Date Requested Status
Stéphane Graber 2012-09-11 Pending
Review via email: mp+123815@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apparmor-profile.dhcpd'
2--- debian/apparmor-profile.dhcpd 2012-07-03 09:54:00 +0000
3+++ debian/apparmor-profile.dhcpd 2012-09-11 19:31:20 +0000
4@@ -60,6 +60,9 @@
5 # (for dhcpd to access).
6 /etc/dhcp/ddns-keys/** r,
7
8+ # allow packages to re-use dhcpd and provide their own specific directories
9+ #include <dhcpd.d>
10+
11 # Site-specific additions and overrides. See local/README for details.
12 #include <local/usr.sbin.dhcpd>
13 }
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2012-09-05 08:59:49 +0000
17+++ debian/changelog 2012-09-11 19:31:20 +0000
18@@ -1,3 +1,10 @@
19+isc-dhcp (4.2.4-1ubuntu8) UNRELEASED; urgency=low
20+
21+ * debian/apparmor-profile.dhcpd: use include directory to enable
22+ other packages to re-use isc-dhcp-server. (LP: #1049177)
23+
24+ -- Scott Moser <smoser@ubuntu.com> Tue, 11 Sep 2012 11:07:52 -0400
25+
26 isc-dhcp (4.2.4-1ubuntu7) quantal-proposed; urgency=low
27
28 * debian/dhclient-script.linux: Explicitly set the PATH to that of
29
30=== modified file 'debian/isc-dhcp-server.install'
31--- debian/isc-dhcp-server.install 2010-11-09 17:40:49 +0000
32+++ debian/isc-dhcp-server.install 2012-09-11 19:31:20 +0000
33@@ -4,3 +4,4 @@
34 usr/sbin/dhcpd
35 etc/dhcp/dhcpd.conf
36 etc/apparmor.d/usr.sbin.dhcpd
37+etc/apparmor.d/dhcpd.d
38
39=== modified file 'debian/rules'
40--- debian/rules 2012-07-03 09:54:00 +0000
41+++ debian/rules 2012-09-11 19:31:20 +0000
42@@ -108,6 +108,7 @@
43
44 # Install apparmor profile
45 mkdir -p $(DESTDIR)/etc/apparmor.d
46+ mkdir -p $(DESTDIR)/etc/apparmor.d/dhcpd.d
47 $(INSTALL_FILE) debian/apparmor-profile.dhcpd $(DESTDIR)/etc/apparmor.d/usr.sbin.dhcpd
48 $(INSTALL_FILE) debian/apparmor-profile.dhclient $(DESTDIR)/etc/apparmor.d/sbin.dhclient
49

Subscribers

People subscribed via source and target branches

to all changes: