From a2867b4eb6d5ffb91179e6888cbf3fb7d8ffcf61 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 14 Oct 2023 23:45:57 +0200 Subject: [PATCH 1/3] feat(systemd): install systemd-executor In [0] systemd gained a new binary - systemd-executor - that's used to spawn processes forked off systemd. Let's copy it into the initrd if it's available. [0] https://github.com/systemd/systemd/pull/27890 (cherry picked from commit bee1c4824a8cd47ce6c01892a548bdc07b1fa678) --- modules.d/00systemd/module-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh index 554c25a08e..9a13a1dbba 100755 --- a/modules.d/00systemd/module-setup.sh +++ b/modules.d/00systemd/module-setup.sh @@ -34,6 +34,7 @@ install() { "$systemdutildir"/systemd \ "$systemdutildir"/systemd-coredump \ "$systemdutildir"/systemd-cgroups-agent \ + "$systemdutildir"/systemd-executor \ "$systemdutildir"/systemd-shutdown \ "$systemdutildir"/systemd-reply-password \ "$systemdutildir"/systemd-fsck \ From c8527357bb06a6c14df557d19251802c2966cc1d Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 16 Nov 2023 08:24:02 +0100 Subject: [PATCH 2/3] fix(resume): add new systemd-hibernate-resume.service Since https://github.com/systemd/systemd/commit/a628d933, the generator only does the initial validation of the system info and then enables the new `systemd-hibernate-resume.service`. Fixes https://github.com/dracutdevs/dracut/issues/2513 --- modules.d/95resume/module-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh index 47d54059bf..a6d7247a2a 100755 --- a/modules.d/95resume/module-setup.sh +++ b/modules.d/95resume/module-setup.sh @@ -67,6 +67,7 @@ install() { if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then inst_multiple -o \ "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \ + "$systemdsystemunitdir"/systemd-hibernate-resume.service \ "$systemdsystemunitdir"/systemd-hibernate-resume@.service \ "$systemdutildir"/systemd-hibernate-resume return 0 From 7e0f44836d495f29a52a98e6acd0fe37fb544361 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 16 Nov 2023 11:42:27 +0100 Subject: [PATCH 3/3] feat(resume): do not attempt to install systemd-hibernate-resume@.service This service is no longer shipped since systemd-v254 (https://github.com/systemd/systemd/commit/760e99bb). --- modules.d/95resume/module-setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh index a6d7247a2a..f020c1aabd 100755 --- a/modules.d/95resume/module-setup.sh +++ b/modules.d/95resume/module-setup.sh @@ -68,7 +68,6 @@ install() { inst_multiple -o \ "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \ "$systemdsystemunitdir"/systemd-hibernate-resume.service \ - "$systemdsystemunitdir"/systemd-hibernate-resume@.service \ "$systemdutildir"/systemd-hibernate-resume return 0 fi