diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-10-09 10:24:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-09 10:24:10 +0200 |
| commit | 6ce06e94b105a9afac069dea7dc79346aa1595e8 (patch) | |
| tree | 916adc70e3502ade3b2e349b6b447e0e024cdefc /src/core | |
| parent | NEWS: announce the F20/F21/F22/F23 key mangling removal scheduled for v258 (diff) | |
| parent | oomd: separate entries with comma for readability (diff) | |
| download | systemd-6ce06e94b105a9afac069dea7dc79346aa1595e8.tar.xz systemd-6ce06e94b105a9afac069dea7dc79346aa1595e8.zip | |
Merge pull request #34671 from yuwata/memory
tree-wide: several memory accounting cleanups
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/service.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/service.c b/src/core/service.c index 7162016313..c008849b78 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -5309,7 +5309,11 @@ static int service_can_live_mount(const Unit *u, sd_bus_error *error) { /* Ensure that the unit runs in a private mount namespace */ if (!exec_needs_mount_namespace(unit_get_exec_context(u), /* params= */ NULL, unit_get_exec_runtime(u))) { - log_unit_debug(u, "Unit not running in private mount namespace, cannot live mount"); + + /* This is also called in property_get_can_live_mount(). Suppress the debugging log when called in it. */ + if (error) + log_unit_debug(u, "Unit not running in private mount namespace, cannot live mount"); + return sd_bus_error_setf( error, SD_BUS_ERROR_INVALID_ARGS, |