aethercast

Merge lp:~morphis/aethercast/fix-apparmor-rules into lp:aethercast

  1. fix-apparmor-rules
  2. Merge into trunk
Proposed by Simon Fels
Status: Merged
Approved by: Simon Fels
Approved revision: 186
Merged at revision: 127
Proposed branch: lp:~morphis/aethercast/fix-apparmor-rules
Merge into: lp:aethercast
Diff against target: 52 lines (+18/-9)
3 files modified
debian/control (+1/-0)
debian/rules (+4/-0)
debian/usr.sbin.aethercast (+13/-9)
To merge this branch: bzr merge lp:~morphis/aethercast/fix-apparmor-rules
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomas Voß (community) Approve
Review via email: mp+287455@code.launchpad.net

Commit message

Fix apparmor rules to let us use the ics-dhcp-server properly.

Description of the change

Fix apparmor rules to let us use the ics-dhcp-server properly.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/aethercast-ci/135/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-ci/134/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/aethercast-ci/135/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

CI fails because we need to merge https://code.launchpad.net/~morphis/aethercast/fix-wds-api-break

Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM, feel free to ignore niggles inline.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/aethercast-autolanding/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-autolanding/10/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/aethercast-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-ci/147/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/aethercast-ci/148/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-01-21 11:13:32 +0000
3+++ debian/control 2016-03-02 11:24:40 +0000
4@@ -5,6 +5,7 @@
5 XSBC-Original-Maintainer: Simon Fels <simon.fels@canonical.com>
6 Build-Depends: cmake,
7 debhelper (>= 9),
8+ dh-apparmor,
9 dbus,
10 google-mock,
11 libboost-dev,
12
13=== modified file 'debian/rules'
14--- debian/rules 2016-01-17 14:01:37 +0000
15+++ debian/rules 2016-03-02 11:24:40 +0000
16@@ -20,3 +20,7 @@
17
18 override_dh_auto_test:
19 # disable
20+
21+override_dh_install:
22+ dh_install
23+ dh_apparmor -paethercast --profile-name=usr.sbin.dhcpd
24
25=== modified file 'debian/usr.sbin.aethercast'
26--- debian/usr.sbin.aethercast 2016-01-30 12:33:55 +0000
27+++ debian/usr.sbin.aethercast 2016-03-02 11:24:40 +0000
28@@ -1,11 +1,15 @@
29 # vim:syntax=apparmor
30
31- # Allow aethercast to start dhcpd with its own configuration
32- # file it needs to provide DHCP for groups it manages through
33- # WiFi Direct. This need to stay as long as NetworkManager does
34- # not has support for WiFi Direct and aethercast is using that.
35- /etc/aethercast/dhcpd.conf r,
36- # In addition aethercast will also point dhcpd to a private
37- # lease/pid file
38- /{,var/}run/aethercast/dhcpd*.leases* lrw,
39- /{,var/}run/aethercast/dhcpd*.pid lrw,
40+# Work around bug:
41+# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662
42+capability dac_override,
43+
44+# Allow aethercast to start dhcpd with its own configuration
45+# file. It needs to provide DHCP for groups it manages through
46+# WiFi Direct. This needs to stay as long as NetworkManager does
47+# not have support for WiFi Direct and aethercast is using that.
48+/etc/aethercast/dhcpd.conf r,
49+# In addition aethercast will also point dhcpd to a private
50+# lease/pid file
51+/{,var/}run/aethercast/dhcpd*.leases lrw,
52+/{,var/}run/aethercast/dhcpd*.pid lrw,

Subscribers

People subscribed via source and target branches

to all changes: