diff options
author | Luca Boccassi <luca.boccassi@microsoft.com> | 2022-01-27 15:10:34 +0100 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@microsoft.com> | 2022-01-28 01:54:10 +0100 |
commit | 3fa80e5e75a98ef6f9a84b01770b71a1774478dc (patch) | |
tree | 52fcb950118bde2160cd1e51219ee8aa056db592 /src/core | |
parent | core: add clearer debug log when setting up ExecDirectories symlinks fails (diff) | |
download | systemd-3fa80e5e75a98ef6f9a84b01770b71a1774478dc.tar.xz systemd-3fa80e5e75a98ef6f9a84b01770b71a1774478dc.zip |
core: do not attempt to add 'private' symlinks when RootImage/RootDirectory are used
A bind mount is added directly from private on the host to the actual
destination directory, no need for the symlinks (which cannot be created
as the bind mount happens first and creates the target as an actual directory)
Fixes https://github.com/systemd/systemd/issues/22264
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/execute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index acc59ef9db..d3266a9ab5 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -3373,7 +3373,7 @@ static int compile_symlinks( return r; } - if (!exec_directory_is_private(context, dt)) + if (!exec_directory_is_private(context, dt) || exec_context_with_rootfs(context)) continue; private_path = path_join(params->prefix[dt], "private", context->directories[dt].items[i].path); |