system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

tree-wide: error handling modernizations

Browse source
This commit is contained in:
Lennart Poettering 2023-03-01 09:37:41 +01:00 committed by Luca Boccassi
parent 8c7a6c742a
commit 1406bd66e4
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/execute.c
View file

@ -4655,11 +4655,13 @@ static int exec_child(
if (mpol_is_valid(numa_policy_get_type(&context->numa_policy))) {
r = apply_numa_policy(&context->numa_policy);
if (r == -EOPNOTSUPP)
log_unit_debug_errno(unit, r, "NUMA support not available, ignoring.");
else if (r < 0) {
*exit_status = EXIT_NUMA_POLICY;
return log_unit_error_errno(unit, r, "Failed to set NUMA memory policy: %m");
if (r < 0) {
if (ERRNO_IS_NOT_SUPPORTED(r))
log_unit_debug_errno(unit, r, "NUMA support not available, ignoring.");
else {
*exit_status = EXIT_NUMA_POLICY;
return log_unit_error_errno(unit, r, "Failed to set NUMA memory policy: %m");
}
}
}
@ -4917,12 +4919,14 @@ static int exec_child(
if (ns_type_supported(NAMESPACE_NET)) {
r = setup_shareable_ns(runtime->netns_storage_socket, CLONE_NEWNET);
if (r == -EPERM)
log_unit_warning_errno(unit, r,
"PrivateNetwork=yes is configured, but network namespace setup failed, ignoring: %m");
else if (r < 0) {
*exit_status = EXIT_NETWORK;
return log_unit_error_errno(unit, r, "Failed to set up network namespacing: %m");
if (r < 0) {
if (ERRNO_IS_PRIVILEGE(r))
log_unit_warning_errno(unit, r,
"PrivateNetwork=yes is configured, but network namespace setup failed, ignoring: %m");
else {
*exit_status = EXIT_NETWORK;
return log_unit_error_errno(unit, r, "Failed to set up network namespacing: %m");
}
}
} else if (context->network_namespace_path) {
*exit_status = EXIT_NETWORK;

4
src/nspawn/nspawn.c
View file

@ -5518,8 +5518,8 @@ static int run(int argc, char *argv[]) {
* two systems write to the same /var). Let's allow it for the special cases where /var is
* either copied (i.e. --ephemeral) or replaced (i.e. --volatile=yes|state). */
if (path_equal(arg_directory, "/") && !(arg_ephemeral || IN_SET(arg_volatile_mode, VOLATILE_YES, VOLATILE_STATE))) {
log_error("Spawning container on root directory is not supported. Consider using --ephemeral, --volatile=yes or --volatile=state.");
r = -EINVAL;
r = log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Spawning container on root directory is not supported. Consider using --ephemeral, --volatile=yes or --volatile=state.");
goto finish;
}