TODO

@@ -128,10 +128,6 @@ Deprecations and removals:
 
 Features:
 
-* Split vconsole-setup in two, of which the second is started via udev (instead
-  of the "restart" job it currently fires). That way, boot becomes purely
-  positive again, and we can nicely order the two against each other.
-
 * Add ELF section to make systemd main binary recognizable cleanly, the same
   way as we make sd-boot recognizable via PE section.
 

src/core/scope.c

@@ -236,6 +236,15 @@ static int scope_coldplug(Unit *u) {
         if (r < 0)
                 return r;
 
+        if (!IN_SET(s->deserialized_state, SCOPE_DEAD, SCOPE_FAILED) && u->pids) {
+                PidRef *pid;
+                SET_FOREACH(pid, u->pids) {
+                        r = unit_watch_pidref(u, pid, /* exclusive= */ false);
+                        if (r < 0)
+                                return r;
+                }
+        }
+
         bus_scope_track_controller(s);
 
         scope_set_state(s, s->deserialized_state);
@@ -502,7 +511,8 @@ static int scope_serialize(Unit *u, FILE *f, FDSet *fds) {
         (void) serialize_item(f, "state", scope_state_to_string(s->state));
         (void) serialize_bool(f, "was-abandoned", s->was_abandoned);
 
-        (void) serialize_item(f, "controller", s->controller);
+        if (s->controller)
+                (void) serialize_item(f, "controller", s->controller);
 
         SET_FOREACH(pid, u->pids)
                 serialize_pidref(f, fds, "pids", pid);

src/journal/journald-manager.h

@@ -236,7 +236,6 @@ void manager_driver_message_internal(Manager *m, pid_t object_pid, const char *f
                 .max_level_kmsg = -1,                                                           \
                 .max_level_console = -1,                                                        \
                 .max_level_wall = -1,                                                           \
-                .max_level_socket = -1,                                                         \
         }
 
 /* gperf lookup function */

units/kmod-static-nodes.service.in

@@ -13,7 +13,6 @@ DefaultDependencies=no
 Before=sysinit.target systemd-tmpfiles-setup-dev-early.service
 ConditionCapability=CAP_SYS_MODULE
 ConditionFileNotEmpty=/lib/modules/%v/modules.devname
-ConditionPathExists={{KMOD}}
 
 [Service]
 Type=oneshot