From 0869e1326a1b76e9363fd948bd9e90704751b659 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 25 Sep 2023 18:10:50 +0200 Subject: [PATCH] oomd: correct listening sockets So, unfortunately oomd uses "io.system." rather than "io.systemd." as prefix for its sockets. This is a mistake, and doesn't match the Varlink interface naming or anything else in oomd. hence, let's fix that. Given that this is an internal protocol between PID1 and oomd let's simply change this without retaining compat. --- src/basic/constants.h | 4 ++-- test/fuzz/fuzz-manager-serialize/state | 2 +- units/systemd-oomd.socket | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/basic/constants.h b/src/basic/constants.h index 20bb4243c6..98816d183c 100644 --- a/src/basic/constants.h +++ b/src/basic/constants.h @@ -95,8 +95,8 @@ } /* Path where PID1 listens for varlink subscriptions from systemd-oomd to notify of changes in ManagedOOM settings. */ -#define VARLINK_ADDR_PATH_MANAGED_OOM_SYSTEM "/run/systemd/io.system.ManagedOOM" +#define VARLINK_ADDR_PATH_MANAGED_OOM_SYSTEM "/run/systemd/io.systemd.ManagedOOM" /* Path where systemd-oomd listens for varlink connections from user managers to report changes in ManagedOOM settings. */ -#define VARLINK_ADDR_PATH_MANAGED_OOM_USER "/run/systemd/oom/io.system.ManagedOOM" +#define VARLINK_ADDR_PATH_MANAGED_OOM_USER "/run/systemd/oom/io.systemd.ManagedOOM" #define KERNEL_BASELINE_VERSION "4.15" diff --git a/test/fuzz/fuzz-manager-serialize/state b/test/fuzz/fuzz-manager-serialize/state index fb4a8d6277..6cb33f2061 100644 --- a/test/fuzz/fuzz-manager-serialize/state +++ b/test/fuzz/fuzz-manager-serialize/state @@ -36,7 +36,7 @@ exec-runtime=foo tmp-dir=foo var-tmp-dir=foo netns-socket-0=0 netns-socket-1=0 i exec-runtime=systemd-resolved.service tmp-dir=/tmp/systemd-private-a0d7e38d0d2043da90d3313a435b56a7-systemd-resolved.service-9RLwQC var-tmp-dir=/var/tmp/systemd-private-a0d7e38d0d2043da90d3313a435b56a7-systemd-resolved.service-lH60S6 exec-runtime=systemd-logind.service tmp-dir=/tmp/systemd-private-a0d7e38d0d2043da90d3313a435b56a7-systemd-logind.service-U3Mkrl var-tmp-dir=/var/tmp/systemd-private-a0d7e38d0d2043da90d3313a435b56a7-systemd-logind.service-bLqCAv exec-runtime=dbus-broker.service tmp-dir=/tmp/systemd-private-a0d7e38d0d2043da90d3313a435b56a7-dbus-broker.service-tjqGny var-tmp-dir=/var/tmp/systemd-private-a0d7e38d0d2043da90d3313a435b56a7-dbus-broker.service-enN2wt -varlink-server-socket-address=/run/systemd/io.system.ManagedOOM varlink-server-socket-fd=43 +varlink-server-socket-address=/run/systemd/io.systemd.ManagedOOM varlink-server-socket-fd=43 varlink-server-socket-address=/run/systemd/userdb/io.systemd.DynamicUser varlink-server-socket-fd=44 systemd-udevd-control.socket diff --git a/units/systemd-oomd.socket b/units/systemd-oomd.socket index 70eb6b7bc3..6953f7e2b9 100644 --- a/units/systemd-oomd.socket +++ b/units/systemd-oomd.socket @@ -20,7 +20,7 @@ ConditionPathExists=/proc/pressure/io ConditionPathExists=/proc/pressure/memory [Socket] -ListenStream=/run/systemd/oom/io.system.ManagedOOM +ListenStream=/run/systemd/oom/io.systemd.ManagedOOM SocketMode=0666 [Install]