manager: add few ", ignoring" and adjust level in one message

diff --git a/src/core/main.c b/src/core/main.c
index 93cbf62769bafd451c21a08d70bb32ab39949e7a..754a847541ffe042facaee2f5a94b5ae21b1cb11 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1755,7 +1755,7 @@ static void update_cpu_affinity(bool skip_setup) {
         log_debug("Setting CPU affinity to %s.", strnull(mask));
 
         if (sched_setaffinity(0, arg_cpu_affinity.allocated, arg_cpu_affinity.set) < 0)
-                log_warning_errno(errno, "Failed to set CPU affinity: %m");
+                log_warning_errno(errno, "Failed to set CPU affinity, ignoring: %m");
 }
 
 static void update_numa_policy(bool skip_setup) {
@@ -1776,7 +1776,7 @@ static void update_numa_policy(bool skip_setup) {
         if (r == -EOPNOTSUPP)
                 log_debug_errno(r, "NUMA support not available, ignoring.");
         else if (r < 0)
-                log_warning_errno(r, "Failed to set NUMA memory policy: %m");
+                log_warning_errno(r, "Failed to set NUMA memory policy, ignoring: %m");
 }
 
 static void filter_args(
@@ -1955,7 +1955,7 @@ static int do_reexecute(
                 (void) execve(args[0], (char* const*) args, saved_env);
                 return log_error_errno(errno, "Failed to execute /bin/sh, giving up: %m");
         } else
-                return log_warning_errno(r, "Failed to execute /sbin/init, giving up: %m");
+                return log_error_errno(r, "Failed to execute /sbin/init, giving up: %m");
 }
 
 static int invoke_main_loop(
@@ -2257,7 +2257,7 @@ static int initialize_runtime(
         if (!arg_system)
                 /* Become reaper of our children */
                 if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0)
-                        log_warning_errno(errno, "Failed to make us a subreaper: %m");
+                        log_warning_errno(errno, "Failed to make us a subreaper, ignoring: %m");
 
         /* Bump up RLIMIT_NOFILE for systemd itself */
         (void) bump_rlimit_nofile(saved_rlimit_nofile);

diff --git a/test/units/testsuite-36.sh b/test/units/testsuite-36.sh
index b6c00c4845e0187fa0450db3819f5669e8d9d75b..f9dfd0810c11e3401d872d91e9de057867aa80a0 100755 (executable)
--- a/test/units/testsuite-36.sh
+++ b/test/units/testsuite-36.sh
@@ -181,7 +181,7 @@ else
     echo "PID1 NUMAPolicy support - Bind policy w/o mask"
     writePID1NUMAPolicy "bind"
     pid1ReloadWithJournal
-    grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog"
+    grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog"
 
     echo "PID1 NUMAPolicy support - Bind policy w/ mask"
     writePID1NUMAPolicy "bind" "0"
@@ -191,7 +191,7 @@ else
     echo "PID1 NUMAPolicy support - Interleave policy w/o mask"
     writePID1NUMAPolicy "interleave"
     pid1ReloadWithJournal
-    grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog"
+    grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog"
 
     echo "PID1 NUMAPolicy support - Interleave policy w/ mask"
     writePID1NUMAPolicy "interleave" "0"
@@ -202,7 +202,7 @@ else
     writePID1NUMAPolicy "preferred"
     pid1ReloadWithJournal
     # Preferred policy with empty node mask is actually allowed and should reset allocation policy to default
-    grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; }
+    grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; }
 
     echo "PID1 NUMAPolicy support - Preferred policy w/ mask"
     writePID1NUMAPolicy "preferred" "0"