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

[Chad Miller]

[Robert Ancell (robert-ancell)]

Thanks Chad!

review: Approve

=== modified file 'data/apparmor/abstractions/lightdm_chromium-browser'
--- data/apparmor/abstractions/lightdm_chromium-browser	2014-09-30 19:33:50 +0000
+++ data/apparmor/abstractions/lightdm_chromium-browser	2015-10-12 17:04:01 +0000
@@ -62,6 +62,10 @@
     @{PROC}/[0-9]*/statm r,            # sandbox wants these
     @{PROC}/[0-9]*/task/[0-9]*/stat r, # sandbox wants these
 
+    owner @{PROC}/@{pid}/setgroups w,
+    owner @{PROC}/@{pid}/uid_map w,
+    owner @{PROC}/@{pid}/gid_map w,
+
     /selinux/ r,
 
     /usr/lib/chromium-browser/chromium-browser-sandbox ix,
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-10-12 14:08:01 +0000
+++ debian/changelog	2015-10-12 17:04:01 +0000
@@ -5,6 +5,8 @@
   * Build with multi-arch
   * debian/patches/xorg-1.17.patch:
     - Fix xserver-allow-tcp=true option not working with X.org 1.17
+  * data/apparmor/abstractions/lightdm_chromium-browser: cgroups support for
+    guest sessions. (LP: #1504049, LP: #1464958)
 
  -- Robert Ancell <[e-mail]>  Mon, 12 Oct 2015 14:57:47 +0100