Merge pull request #22378 from bluca/on_fail_follow_ups

Follow-ups for #20833

man/systemd.netdev.xml

@@ -629,7 +629,7 @@
           endpoint answers ARP requests from the local bridge on behalf
           of remote Distributed Overlay Virtual Ethernet
           <ulink url="https://en.wikipedia.org/wiki/Distributed_Overlay_Virtual_Ethernet">
-          (DVOE)</ulink> clients. Defaults to false.</para>
+          (DOVE)</ulink> clients. Defaults to false.</para>
         </listitem>
       </varlistentry>
       <varlistentry>

src/core/job.c

@@ -99,12 +99,8 @@ Job* job_free(Job *j) {
         assert(!j->subject_list);
         assert(!j->object_list);
 
-        do {
+        while (!LIST_IS_EMPTY(j->triggered_by))
-                Unit *tu = NULL;
+                LIST_POP(triggered_by, j->triggered_by);
-
-                LIST_FOREACH(triggered_by, tu, j->triggered_by)
-                        LIST_REMOVE(triggered_by, j->triggered_by, tu);
-        } while (!LIST_IS_EMPTY(j->triggered_by));
 
         job_unlink(j);
 

src/core/service.c

@@ -1482,36 +1482,27 @@ static int service_create_monitor_md_env(Job *j, char **ret) {
                 if (!env_source)
                         continue;
 
-                if (first) {
+                /* Add the environment variable name first. */
-                        /* Add the environment variable name first. */
+                if (first && !strextend(&var, "MONITOR_METADATA="))
-                        r = strextendf(&var, "MONITOR_METADATA=");
+                        return -ENOMEM;
-                        if (r < 0)
-                                return r;
 
-                }
+                if (!strextend(&var, !first ? list_delim : "", "SERVICE_RESULT=", service_result_to_string(env_source->result)))
-
+                        return -ENOMEM;
-                r = strextendf(&var, "%sSERVICE_RESULT=%s",
-                               !first ? list_delim : "", service_result_to_string(env_source->result));
-                if (r < 0)
-                        return r;
 
                 first = false;
 
                 if (env_source->main_exec_status.pid > 0 &&
                     dual_timestamp_is_set(&env_source->main_exec_status.exit_timestamp)) {
-                        r = strextendf(&var, ",EXIT_CODE=%s",
+                        if (!strextend(&var, ",EXIT_CODE=", sigchld_code_to_string(env_source->main_exec_status.code)))
-                                       sigchld_code_to_string(env_source->main_exec_status.code));
+                                return -ENOMEM;
-                        if (r < 0)
-                                return r;
 
-                        if (env_source->main_exec_status.code == CLD_EXITED)
+                        if (env_source->main_exec_status.code == CLD_EXITED) {
                                 r = strextendf(&var, ",EXIT_STATUS=%i",
                                                env_source->main_exec_status.status);
-                        else
+                                if (r < 0)
-                                r = strextendf(&var, ",EXIT_STATUS=%s",
+                                        return r;
-                                               signal_to_string(env_source->main_exec_status.status));
+                        } else if (!strextend(&var, ",EXIT_STATUS=", signal_to_string(env_source->main_exec_status.status)))
-                        if (r < 0)
+                                return -ENOMEM;
-                                return r;
                 }
 
                 if (!sd_id128_is_null(UNIT(env_source)->invocation_id)) {
@@ -1521,9 +1512,8 @@ static int service_create_monitor_md_env(Job *j, char **ret) {
                                 return r;
                 }
 
-                r = strextendf(&var, ",UNIT=%s", UNIT(env_source)->id);
+                if (!strextend(&var, ",UNIT=", UNIT(env_source)->id))
-                if (r < 0)
+                        return -ENOMEM;
-                        return r;
         }
 
         *ret = TAKE_PTR(var);

src/shared/watchdog.c

@@ -133,6 +133,10 @@ static int open_watchdog(void) {
         fn = !watchdog_device || path_equal(watchdog_device, "/dev/watchdog") ?
                 "/dev/watchdog0" : watchdog_device;
 
+        r = free_and_strdup(&watchdog_device, fn);
+        if (r < 0)
+                return log_oom_debug();
+
         watchdog_fd = open(fn, O_WRONLY|O_CLOEXEC);
         if (watchdog_fd < 0)
                 return log_debug_errno(errno, "Failed to open watchdog device %s, ignoring: %m", fn);

src/shutdown/shutdown.c

@@ -531,8 +531,9 @@ int main(int argc, char *argv[]) {
                           need_md_detach ? " MD devices," : "");
         }
 
-        /* We're done with the watchdog. */
+        /* We're done with the watchdog. Note that the watchdog is explicitly not
-        watchdog_close(true);
+         * stopped here. It remains active to guard against any issues during the
+         * rest of the shutdown sequence. */
         watchdog_free_device();
 
         arguments[0] = NULL;