summaryrefslogtreecommitdiff
path: root/src/shared/dev-setup.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-08-14 18:56:54 +0200
committerLennart Poettering <lennart@poettering.net>2020-08-20 10:17:52 +0200
commit9fac502920a648d82e21b207989bfc3c00fbdebc (patch)
tree8365bde08f9e11bae76b224f50f3e64f4b4ccf1d /src/shared/dev-setup.h
parente96ceabac958bf30dcbbf51c6cdf44477ca96c16 (diff)
downloadsystemd-9fac502920a648d82e21b207989bfc3c00fbdebc.tar.gz
nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host
Let's make /run/host the sole place we pass stuff from host to container in and place the "inaccessible" nodes in /run/host too. In contrast to the previous two commits this is a minor compat break, but not a relevant one I think. Previously the container manager would place these nodes in /run/systemd/inaccessible/ and that's where PID 1 in the container would try to add them too when missing. Container manager and PID 1 in the container would thus manage the same dir together. With this change the container manager now passes an immutable directory to the container and leaves /run/systemd entirely untouched, and managed exclusively by PID 1 inside the container, which is nice to have clear separation on who manages what. In order to make sure systemd then usses the /run/host/inaccesible/ nodes this commit changes PID 1 to look for that dir and if it exists will symlink it to /run/systemd/inaccessible. Now, this will work fine if new nspawn and new pid 1 in the container work together. as then the symlink is created and the difference between the two dirs won't matter. For the case where an old nspawn invokes a new PID 1: in this case things work as they always worked: the dir is managed together. For the case where different container manager invokes a new PID 1: in this case the nodes aren't typically passed in, and PID 1 in the container will try to create them and will likely fail partially (though gracefully) when trying to create char/block device nodes. THis is fine though as there are fallbacks in place for that case. For the case where a new nspawn invokes an old PID1: this is were the (minor) incompatibily happens: in this case new nspawn will place the nodes in the /run/host/inaccessible/ subdir, but the PID 1 in the container won't look for them there. Since the nodes are also not pre-created in /run/systed/inaccessible/ PID 1 will try to create them there as if a different container manager sets them up. This is of course not sexy, but is not a total loss, since as mentioned fallbacks are in place anyway. Hence I think it's OK to accept this minor incompatibility.
Diffstat (limited to 'src/shared/dev-setup.h')
-rw-r--r--src/shared/dev-setup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h
index 72b90ec4de..437c0e96e6 100644
--- a/src/shared/dev-setup.h
+++ b/src/shared/dev-setup.h
@@ -5,4 +5,4 @@
int dev_setup(const char *prefix, uid_t uid, gid_t gid);
-int make_inaccessible_nodes(const char *root, uid_t uid, gid_t gid);
+int make_inaccessible_nodes(const char *parent_dir, uid_t uid, gid_t gid);