]> git.ipfire.org Git - thirdparty/systemd.git/commit - src/shared/dissect-image.c
nspawn: make sure idmapped logic works if DDI contains only /usr/ tree
authorLennart Poettering <lennart@poettering.net>
Tue, 31 Oct 2023 15:10:32 +0000 (16:10 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 1 Nov 2023 00:50:43 +0000 (00:50 +0000)
commitdba4fa891040e1280569b4b9b8fc5b61ddbaabcf
treef8be10569f9f62d1a970e2309cd9903f842349cb
parentf456764cdaadb9dc57b7eb68f9be2972c5b3ccba
nspawn: make sure idmapped logic works if DDI contains only /usr/ tree

If we have a DDI that contains only a /usr/ tree (and which is thus
combined with a tmpfs for root on boot) we previously would try to apply
idmapping to the tmpfs, but not the /usr/ mount. That's broken of
course.

Fix this by applying it to both trees.
src/nspawn/nspawn-mount.c
src/nspawn/nspawn.c
src/shared/dissect-image.c
src/shared/mount-util.c
src/shared/mount-util.h