Merge pull request #26435 from poettering/pid1-seccomp-disable-fix

pid1: fix handling of SystemCallArchitectures= if seccomp is off
This commit is contained in:
Luca Boccassi
2023-02-16 14:49:52 +00:00
committed by GitHub
2 changed files with 3 additions and 1 deletions
-1
View File
@@ -5600,7 +5600,6 @@ int exec_context_destroy_runtime_directory(const ExecContext *c, const char *run
(void) unlink(symlink_abs);
}
}
return 0;
+3
View File
@@ -645,6 +645,9 @@ static int parse_config_file(void) {
{ "Manager", "NoNewPrivileges", config_parse_bool, 0, &arg_no_new_privs },
#if HAVE_SECCOMP
{ "Manager", "SystemCallArchitectures", config_parse_syscall_archs, 0, &arg_syscall_archs },
#else
{ "Manager", "SystemCallArchitectures", config_parse_warn_compat, DISABLED_CONFIGURATION, NULL },
#endif
{ "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec },
{ "Manager", "DefaultTimerAccuracySec", config_parse_sec, 0, &arg_default_timer_accuracy_usec },