SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/exec-invoke: fix ProtectHostname= value in log message

Browse Source 
Follow-up for cf48bde7ae.
This commit is contained in:
Yu Watanabe
2024-12-16 23:55:44 +09:00
parent 7fd45eec37
commit 0d298a771a
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/exec-invoke.c
+7 -12
View File
@@ -1708,22 +1708,17 @@ static int apply_protect_hostname(const ExecContext *c, const ExecParameters *p,
if (unshare(CLONE_NEWUTS) < 0) {
if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno)) {
*ret_exit_status = EXIT_NAMESPACE;
return log_exec_error_errno(c,
p,
errno,
"Failed to set up UTS namespacing: %m");
return log_exec_error_errno(c, p, errno, "Failed to set up UTS namespacing: %m");
}
log_exec_warning(c,
p,
"ProtectHostname=yes is configured, but UTS namespace setup is "
"prohibited (container manager?), ignoring namespace setup.");
log_exec_warning(c, p,
"ProtectHostname=%s is configured, but UTS namespace setup is prohibited (container manager?), ignoring namespace setup.",
protect_hostname_to_string(c->protect_hostname));
}
} else
log_exec_warning(c,
p,
"ProtectHostname=yes is configured, but the kernel does not "
"support UTS namespaces, ignoring namespace setup.");
log_exec_warning(c, p,
"ProtectHostname=%s is configured, but the kernel does not support UTS namespaces, ignoring namespace setup.",
protect_hostname_to_string(c->protect_hostname));
#if HAVE_SECCOMP
if (c->protect_hostname == PROTECT_HOSTNAME_YES) {