Merge lp:~rcj/launchpad-buildd/lp1716060 into lp:launchpad-buildd

Proposed by Robert C Jennings
Status: Merged
Merged at revision: 284
Proposed branch: lp:~rcj/launchpad-buildd/lp1716060
Merge into: lp:launchpad-buildd
Diff against target: 12 lines (+2/-0)
1 file modified
lpbuildd/target/lxd.py (+2/-0)
To merge this branch: bzr merge lp:~rcj/launchpad-buildd/lp1716060
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+330527@code.launchpad.net

Description of the change

The ubuntu-cpc project in livecd-rootfs does not build on s390x without CAP_SYS_RAWIO for zipl (bootloader). This patch was posted by cjwatson in response to the issue.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

This needs a test change too. My quick proof of concept on IRC didn't include that because I was assuming I'd add it before proposing it seriously.

review: Needs Fixing
Revision history for this message
Adam Conrad (adconrad) wrote :

This has been cowboyed into production for testing. Looks like that gets past the zipl issue and lands us on another:

https://launchpad.net/~cloudware/+livefs/ubuntu/artful/cpc/+build/109524

Revision history for this message
Colin Watson (cjwatson) wrote :

I'm going to fix the tests and land this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lpbuildd/target/lxd.py'
2--- lpbuildd/target/lxd.py 2017-09-08 00:04:23 +0000
3+++ lpbuildd/target/lxd.py 2017-09-11 15:15:12 +0000
4@@ -266,6 +266,8 @@
5
6 raw_lxc_config = [
7 ("lxc.aa_profile", "unconfined"),
8+ ("lxc.cap.drop", ""),
9+ ("lxc.cap.drop", "sys_time sys_module mac_admin mac_override"),
10 ("lxc.cgroup.devices.deny", ""),
11 ("lxc.cgroup.devices.allow", ""),
12 ("lxc.mount.auto", ""),

Subscribers

People subscribed via source and target branches