Merge lp:~cmiller/lightdm/guest-session-chromium-sandbox-cgroups into lp:lightdm

Proposed by Chad Miller on 2015-10-12
Status: Merged
Approved by: Robert Ancell on 2015-10-12
Approved revision: 2200
Merged at revision: 2200
Proposed branch: lp:~cmiller/lightdm/guest-session-chromium-sandbox-cgroups
Merge into: lp:lightdm
Diff against target: 26 lines (+6/-0)
2 files modified
data/apparmor/abstractions/lightdm_chromium-browser (+4/-0)
debian/changelog (+2/-0)
To merge this branch: bzr merge lp:~cmiller/lightdm/guest-session-chromium-sandbox-cgroups
Reviewer Review Type Date Requested Status
Robert Ancell 2015-10-12 Approve on 2015-10-12
Review via email: mp+274174@code.launchpad.net
To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Thanks Chad!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/apparmor/abstractions/lightdm_chromium-browser'
2--- data/apparmor/abstractions/lightdm_chromium-browser 2014-09-30 19:33:50 +0000
3+++ data/apparmor/abstractions/lightdm_chromium-browser 2015-10-12 17:04:01 +0000
4@@ -62,6 +62,10 @@
5 @{PROC}/[0-9]*/statm r, # sandbox wants these
6 @{PROC}/[0-9]*/task/[0-9]*/stat r, # sandbox wants these
7
8+ owner @{PROC}/@{pid}/setgroups w,
9+ owner @{PROC}/@{pid}/uid_map w,
10+ owner @{PROC}/@{pid}/gid_map w,
11+
12 /selinux/ r,
13
14 /usr/lib/chromium-browser/chromium-browser-sandbox ix,
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2015-10-12 14:08:01 +0000
18+++ debian/changelog 2015-10-12 17:04:01 +0000
19@@ -5,6 +5,8 @@
20 * Build with multi-arch
21 * debian/patches/xorg-1.17.patch:
22 - Fix xserver-allow-tcp=true option not working with X.org 1.17
23+ * data/apparmor/abstractions/lightdm_chromium-browser: cgroups support for
24+ guest sessions. (LP: #1504049, LP: #1464958)
25
26 -- Robert Ancell <robert.ancell@canonical.com> Mon, 12 Oct 2015 14:57:47 +0100
27

Subscribers

People subscribed via source and target branches