]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cgroup: whitelist inaccessible devices for "auto" and "closed" DevicePolicy. 3779/head
authorAlessandro Puccetti <alessandro@kinvolk.io>
Fri, 22 Jul 2016 10:00:49 +0000 (12:00 +0200)
committerAlessandro Puccetti <alessandro@kinvolk.io>
Fri, 22 Jul 2016 14:08:31 +0000 (16:08 +0200)
https://github.com/systemd/systemd/pull/3685 introduced
/run/systemd/inaccessible/{chr,blk} to map inacessible devices,
this patch allows systemd running inside a nspawn container to create
/run/systemd/inaccessible/{chr,blk}.

src/core/cgroup.c

index 8b0f11ed5004933f1099e63f463d1505bdc1c8df..c19e43f571c1f0667d60c245ae8a069edafcd9f8 100644 (file)
@@ -800,7 +800,10 @@ static void cgroup_context_apply(Unit *u, CGroupMask mask, ManagerState state) {
                                 "/dev/random\0" "rwm\0"
                                 "/dev/urandom\0" "rwm\0"
                                 "/dev/tty\0" "rwm\0"
-                                "/dev/pts/ptmx\0" "rw\0"; /* /dev/pts/ptmx may not be duplicated, but accessed */
+                                "/dev/pts/ptmx\0" "rw\0" /* /dev/pts/ptmx may not be duplicated, but accessed */
+                                /* Allow /run/systemd/inaccessible/{chr,blk} devices for mapping InaccessiblePaths */
+                                "/run/systemd/inaccessible/chr\0" "rwm\0"
+                                "/run/systemd/inaccessible/blk\0" "rwm\0";
 
                         const char *x, *y;