core/scope: drop effectively unused unit_watch_pidref() calls (#38186 )

update TODO
journal: Fix socket max level initialization
2025-10-07 12:44:45 +02:00 · 2025-07-12 07:27:56 +02:00 · 2025-07-12 07:22:56 +02:00 · 2025-07-12 07:18:45 +02:00 · 2025-07-12 07:18:17 +02:00 · 2025-07-11 22:20:25 +02:00
4 changed files with 7 additions and 11 deletions
--- a/4
+++ b/4
@ -128,6 +128,10 @@ 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.

--- a/src/core/scope.c
+++ b/src/core/scope.c
@ -236,15 +236,6 @@ 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);
@ -511,8 +502,7 @@ 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);

-        if (s->controller)
-                (void) serialize_item(f, "controller", s->controller);
+        (void) serialize_item(f, "controller", s->controller);

        SET_FOREACH(pid, u->pids)
                serialize_pidref(f, fds, "pids", pid);
--- a/src/journal/journald-manager.h
+++ b/src/journal/journald-manager.h
@ -236,6 +236,7 @@ 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 */
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@ -13,6 +13,7 @@ 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
Author	SHA1	Message	Date
Lennart Poettering	d38dd7d17a	core/scope: drop effectively unused unit_watch_pidref() calls (#38186 )	2025-07-12 07:27:56 +02:00
Lennart Poettering	6a26f25b74	update TODO	2025-07-12 07:22:56 +02:00
DaanDeMeyer	bd427d005c	journal: Fix socket max level initialization Follow up for df5b3426f60bb626f46f93fbdacecae274c1645b	2025-07-12 07:18:45 +02:00
Yu Watanabe	7c208a64ba	units: check if kmod command exists We already check existences of quotaon in quotaon@.service and quotacheck in systemd-quotacheck@.service. Let's also check if kmod command exists. Closes #38179.	2025-07-12 07:18:17 +02:00
Mike Yuan	66867d5308	core/scope: serialize_item() is NOP on NULL	2025-07-11 22:20:25 +02:00
Mike Yuan	4db4641a65	core/scope: drop effectively unused unit_watch_pidref() calls Follow-up for 495e75ed5c8cce933947dae10a4a1b5f8067e432 The mentioned commit switched scope unit's "pids" deserialization to call unit_watch_pid() already, meaning all later invocations in scope_coldplug() are no-op. Remove the cruft altogether.	2025-07-11 21:58:51 +02:00