.github/workflows/build-test.sh

@@ -47,7 +47,6 @@ PACKAGES=(
     libxkbcommon-dev
     libxtables-dev
     libzstd-dev
-    linux-tools-generic
     mold
     mount
     net-tools
@@ -144,12 +143,6 @@ sudo apt-get -y install "${PACKAGES[@]}"
 pip3 install --user -r .github/workflows/requirements.txt --require-hashes --break-system-packages
 export PATH="$HOME/.local/bin:$PATH"
 
-# TODO: drop after we switch to ubuntu 26.04
-bpftool_dir=$(dirname "$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)")
-if [ -n "$bpftool_dir" ]; then
-    export PATH="$bpftool_dir:$PATH"
-fi
-
 if [[ -n "$CUSTOM_PYTHON" ]]; then
     # If CUSTOM_PYTHON is set we need to pull jinja2 from pip, as a local interpreter is used
     pip3 install --user --break-system-packages jinja2

.github/workflows/unit-tests.sh

@@ -18,7 +18,6 @@ ADDITIONAL_DEPS=(
     libtss2-dev
     libxkbcommon-dev
     libzstd-dev
-    linux-tools-generic
     python3-libevdev
     python3-pip
     python3-pyelftools
@@ -75,12 +74,6 @@ for phase in "${PHASES[@]}"; do
             capsh --drop=all -- -c "stat $PWD/meson.build"
             ;;
         RUN|RUN_GCC|RUN_CLANG|RUN_CLANG_RELEASE)
-            # TODO: drop after we switch to ubuntu 26.04
-            bpftool_dir=$(dirname "$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)")
-            if [ -n "$bpftool_dir" ]; then
-                export PATH="$bpftool_dir:$PATH"
-            fi
-
             if [[ "$phase" =~ ^RUN_CLANG ]]; then
                 export CC=clang
                 export CXX=clang++
@@ -112,12 +105,6 @@ for phase in "${PHASES[@]}"; do
             TZ=GMT+12 meson test "${MESON_TEST_ARGS[@]}" -C build --print-errorlogs
             ;;
         RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
-            # TODO: drop after we switch to ubuntu 26.04
-            bpftool_dir=$(dirname "$(find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)")
-            if [ -n "$bpftool_dir" ]; then
-                export PATH="$bpftool_dir:$PATH"
-            fi
-
             MESON_ARGS=(--optimization=1)
 
             if [[ "$phase" =~ ^RUN_CLANG_ASAN_UBSAN ]]; then

src/core/audit-fd.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int get_core_audit_fd(void);
 void close_core_audit_fd(void);

src/core/clock-warp.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int clock_reset_timewarp(void);
 void clock_apply_epoch(bool allow_backwards);

src/core/core-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"        /* IWYU pragma: export */
 #include "shared-forward.h"             /* IWYU pragma: export */
 #include "unit-def.h"                   /* IWYU pragma: export */

src/core/crash-handler.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 typedef enum CrashAction {
         CRASH_FREEZE,

src/core/kill.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 typedef enum KillMode {
         /* The kill mode is a property of a unit. */

src/core/main.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 #include "crash-handler.h"
 
 extern bool arg_dump_core;

src/core/manager.h

@@ -6,7 +6,7 @@
 #include "cgroup.h"
 #include "common-signal.h"
 #include "execute.h"
-#include "core-forward.h"
+#include "shared-forward.h"
 #include "log.h"
 #include "path-lookup.h"
 #include "show-status.h"

src/core/selinux-setup.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int mac_selinux_setup(bool *loaded_policy);

src/core/show-status.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 /* Manager status */
 

src/core/smack-setup.h

@@ -7,6 +7,6 @@
         Nathaniel Chen <nathaniel.chen@intel.com>
 ***/
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int mac_smack_setup(bool *loaded_policy);

src/core/unit-dependency-atom.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 /* Flags that identify the various "atomic" behaviours a specific dependency type implies. Each dependency is
  * a combination of one or more of these flags that define what they actually entail. */

src/core/varlink-cgroup.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int unit_cgroup_context_build_json(sd_json_variant **ret, const char *name, void *userdata);
 int unit_cgroup_runtime_build_json(sd_json_variant **ret, const char *name, void *userdata);

src/core/varlink-common.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int rlimit_build_json(sd_json_variant **ret, const char *name, void *userdata);
 int rlimit_table_build_json(sd_json_variant **ret, const char *name, void *userdata);

src/core/varlink-dynamic-user.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int vl_method_get_user_record(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
 int vl_method_get_group_record(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);

src/core/varlink-manager.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 int vl_method_describe_manager(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);

src/core/varlink-unit.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "core-forward.h"
+#include "shared-forward.h"
 
 #define VARLINK_ERROR_UNIT_NO_SUCH_UNIT "io.systemd.Unit.NoSuchUnit"
 

src/home/homed-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

src/home/homed-home.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "shared-forward.h"
 #include "homed-forward.h"
 #include "pidref.h"
 #include "stat-util.h"

src/home/homework-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef enum HomeSetupFlags HomeSetupFlags;

src/journal/journald-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

src/libsystemd/sd-bus/bus-forward.h

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
+#include "sd-forward.h"
-
-#include "sd-forward.h"         /* IWYU pragma: export */
 
 typedef enum BusAuth BusAuth;
 typedef enum BusSlotType BusSlotType;

src/login/logind-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

src/login/logind-user.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "shared-forward.h"
 #include "list.h"
 #include "logind-forward.h"
 #include "time-util.h"

src/machine/machine-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Machine Machine;

src/network/networkd-address.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include "firewall-util.h"
+#include "shared-forward.h"
 #include "in-addr-util.h"
 #include "networkd-forward.h"
 #include "networkd-util.h"

src/network/networkd-bridge-fdb.h

@@ -8,6 +8,7 @@
 #include <linux/neighbour.h>
 #include <net/ethernet.h>
 
+#include "shared-forward.h"
 #include "in-addr-util.h"
 #include "networkd-forward.h"
 

src/network/networkd-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

src/network/networkd-link.h

@@ -4,6 +4,7 @@
 #include <linux/nl80211.h>
 
 #include "ether-addr-util.h"
+#include "shared-forward.h"
 #include "network-util.h"
 #include "networkd-bridge-vlan.h"
 #include "networkd-forward.h"

src/portable/portabled-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Manager Manager;

src/resolve/resolved-dns-scope.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include "dns-def.h"
+#include "shared-forward.h"
 #include "list.h"
 #include "ratelimit.h"
 #include "resolve-util.h"

src/resolve/resolved-dns-server.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "shared-forward.h"
 #include "in-addr-util.h"
 #include "list.h"
 #include "resolved-conf.h"

src/resolve/resolved-dns-stream.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "shared-forward.h"
 #include "list.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dnstls.h"

src/resolve/resolved-dnssd-bus.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "resolved-forward.h"
+#include "shared-forward.h"
 
 extern const BusObjectImplementation dnssd_object;
 

src/resolve/resolved-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

src/resolve/resolved-manager.h

@@ -4,6 +4,7 @@
 #include <sys/stat.h>
 
 #include "common-signal.h"
+#include "shared-forward.h"
 #include "list.h"
 #include "resolve-util.h"
 #include "resolved-dns-browse-services.h"

src/sysupdate/sysupdate-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Context Context;

src/timesync/timesyncd-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

src/udev/udev-builtin.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "udev-forward.h"
+#include "shared-forward.h"
 #include "udev-event.h"
 
 typedef struct UdevBuiltin {

src/udev/udev-error.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "udev-forward.h"
+#include "shared-forward.h"
 
 int device_add_errno(sd_device *dev, int error);
 int device_add_exit_status(sd_device *dev, int status);

src/udev/udev-forward.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* IWYU pragma: always_keep */
-
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct UdevCtrl UdevCtrl;

src/udev/udev-manager.h

@@ -3,6 +3,7 @@
 
 #include "sd-event.h"
 
+#include "shared-forward.h"
 #include "list.h"
 #include "udev-config.h"
 #include "udev-forward.h"

src/udev/udev-node.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "udev-forward.h"
+#include "shared-forward.h"
 
 int udev_node_apply_permissions(
                 sd_device *dev,

src/udev/udev-trace.h

@@ -8,7 +8,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "errno-util.h"
-#include "udev-forward.h"
+#include "shared-forward.h"
 
 /* Each trace point can have different number of additional arguments. Note that when the macro is used only
  * additional arguments are listed in the macro invocation!

test/units/TEST-55-OOMD.sh

@@ -301,7 +301,6 @@ testcase_reload() {
 testcase_kernel_oom() {
     cat >/tmp/script.sh <<"EOF"
 #!/usr/bin/env bash
-set -x
 choom --adjust '+1000' -- bash -c 'echo f >/proc/sysrq-trigger && exec sleep infinity'
 choom --adjust '+1000' -p $$
 echo f >/proc/sysrq-trigger
@@ -325,23 +324,13 @@ EOF
 
     cat >/tmp/script.sh <<"EOF"
 #!/usr/bin/env bash
-set -x
 echo '+memory' >/sys/fs/cgroup/system.slice/oom-kill.service/cgroup.subtree_control
 mkdir /sys/fs/cgroup/system.slice/oom-kill.service/sub
 echo 1 >/sys/fs/cgroup/system.slice/oom-kill.service/sub/memory.oom.group
-
+echo $$ >/sys/fs/cgroup/system.slice/oom-kill.service/sub/cgroup.procs
-# Start a child process in the subcgroup that will trigger OOM and be killed but keep the main process
+choom --adjust '+1000' -p $$
-# outside the subcgroup to avoid a race condition where the kernel SIGKILLs the main process before systemd
-# can process the OOM notification. With the main process still alive, systemd should have time to receive
-# the OOM event and enter the 'oom-kill' state before the service exits.
-(
-    echo $BASHPID >/sys/fs/cgroup/system.slice/oom-kill.service/sub/cgroup.procs
-    choom --adjust '+1000' -p $BASHPID
 echo f >/proc/sysrq-trigger
 exec sleep infinity
-) &
-wait $! || :
-exec sleep infinity
 EOF
     chmod +x /tmp/script.sh