From 437ed78b9e23f32900021c7789af66b061da21cc Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Thu, 28 Mar 2024 23:40:24 +0800 Subject: [PATCH] Fix initrd cannot boot --- ...eat-systemd-install-systemd-executor.patch | 29 +++++++++++++++++++ dracut.spec | 9 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 1001-feat-systemd-install-systemd-executor.patch diff --git a/1001-feat-systemd-install-systemd-executor.patch b/1001-feat-systemd-install-systemd-executor.patch new file mode 100644 index 0000000..f1a588f --- /dev/null +++ b/1001-feat-systemd-install-systemd-executor.patch @@ -0,0 +1,29 @@ +From bee1c4824a8cd47ce6c01892a548bdc07b1fa678 Mon Sep 17 00:00:00 2001 +From: Frantisek Sumsal +Date: Sat, 14 Oct 2023 23:45:57 +0200 +Subject: [PATCH] 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 +--- + 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 554c25a0..9a13a1db 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 \ +-- +2.19.2 + diff --git a/dracut.spec b/dracut.spec index d66ab36..8edc12d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define dracutlibdir %{_prefix}/lib/dracut %bcond_without doc @@ -70,6 +70,10 @@ Patch9: 0001-fix-make-iso-scan-trigger-udev-events.patch # https://github.com/dracutdevs/dracut/pull/2481 Patch17: 2481-remove-microcode-check-based-on-CONFIG_MICROCODE_.patch +# https://github.com/dracutdevs/dracut/commit/bee1c4824a8cd47ce6c01892a548bdc07b1fa678 +# Related to: https://github.com/systemd/systemd/commit/bb5232b6a3b8af075ee06cc87416e5f49a6170d3 +Patch1001: 1001-feat-systemd-install-systemd-executor.patch + BuildRequires: bash BuildRequires: git-core BuildRequires: pkgconfig(libkmod) >= 23 @@ -462,6 +466,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %doc README.md docs/HACKING.md AUTHORS NEWS.md %changelog +* Thu Mar 28 2024 Chang Gao - 059-2 +- Fix initrd missing systemd-executor + * Mon Feb 19 2024 mgb01105731 - 059-1 - update to 059 -- Gitee