From 5a468f5bde781108339a7ff8c05f7068615175d3 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Wed, 21 Feb 2024 22:30:02 +0100 Subject: [PATCH] Add dracut 060 Signed-off-by: Piotr Gorski --- dracut/.SRCINFO | 20 +- dracut/PKGBUILD | 27 +-- dracut/dracut-systemd-253.patch | 225 ----------------------- dracut/dracut-systemd-255-pcrphase.patch | 19 +- 4 files changed, 27 insertions(+), 264 deletions(-) delete mode 100644 dracut/dracut-systemd-253.patch diff --git a/dracut/.SRCINFO b/dracut/.SRCINFO index 1f68e07a..0f2beea3 100644 --- a/dracut/.SRCINFO +++ b/dracut/.SRCINFO @@ -1,9 +1,9 @@ # Generated by makepkg 6.0.2 -# Tue Feb 20 22:07:51 UTC 2024 +# Wed Feb 21 21:19:09 UTC 2024 pkgbase = dracut pkgdesc = An event driven initramfs infrastructure - pkgver = 059 - pkgrel = 5.3 + pkgver = 060 + pkgrel = 0.1 url = https://dracut.wiki.kernel.org arch = x86_64 license = GPL-2.0-or-later @@ -34,7 +34,7 @@ pkgbase = dracut provides = initramfs backup = etc/dracut.conf backup = etc/dracut-cachyos.conf - source = https://github.com/dracutdevs/dracut/archive/059/dracut-059.tar.gz + source = https://github.com/dracutdevs-extra/dracut-canary/archive/060/dracut-060.tar.gz source = dracut-rebuild source = dracut-install source = dracut-remove @@ -43,13 +43,9 @@ pkgbase = dracut source = dracut-cachyos.conf source = snapshot-overlay.sh source = module-setup.sh - source = dracut-systemd-253.patch - source = dracut-systemd-254-uki.patch::https://github.com/dracutdevs/dracut/commit/f32e95bcadbc5158843530407adc1e7b700561b1.patch - source = dracut-systemd-255-systemd-executor.patch::https://github.com/dracutdevs/dracut/pull/2535/commits/62fd8ebe4776dbb60ca04a865c2d160e45d65e91.patch source = dracut-systemd-255-pcrphase.patch - source = dracut-systemd-255-hibernate-resume.patch::https://github.com/dracutdevs/dracut/pull/2527/commits/a2fe89116db4b286fbf515f26bd1773b5e6ee8ad.patch validpgpkeys = 7F3D64824AC0B6B8009E50504BC0896FB5693595 - sha512sums = 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d + sha512sums = 3a1df3ef830638fe118048b06f055332b3c51d32b6dffad7b90da674be5b646aa3161891115c92a711e05e32f99e6f682ac31eaddbeb537d9710c0729e0d2da1 sha512sums = 6457ce228e78e1d7f07eafec6f37484264004e53e170b357093d2a92c024588bc28a4c4664539e7ca42a6e6838f156ca7cb047f3b8c927228d6ead2a43786d2f sha512sums = f298693ee1a637329b1a38c746151c2ae8d2ae431f894c3001f55d812a2a20a68907ffa0b04ba748c18a2898cc30e0f49e75d0d13c7dd453129304f3cfd4621e sha512sums = d687dd7951ffabe696a2f6b5f27d8446173c61f5c744f447065045c702c24c0bd89eb610c6a3ec0f56c5afb8aeff2199a1c2bfd7926f0a5f817e0f53c3c92529 @@ -58,10 +54,6 @@ pkgbase = dracut sha512sums = 3fb23adbf462d655638a6a5a3083b464150b05b088e9139fceda500ba7560a29eb90d0e4dab896a257264fc6e72ec537a0519ad4e4e25e4c44b2dc3263cb5a52 sha512sums = cd755060b6a2c534f8ee5ec9d1fff18ee71250db1ab4105fc9df4c28e1634fad031944b94790da8b29f296e013631bd61731423c1f847e95b1bd415a7a5ca4a5 sha512sums = 461231a756b6bc250fb973a5b4b6fbc0b2d6f8dae0dbc89a37bab17745dcfe38d9ae6cfe58bd4b9c4661e5f0024577ad9e4aa1d3c16169e7a83744da4b9068a5 - sha512sums = dfbef5ee06fd0f7b51bfd3571eb284272d7694754eaf232cf1a14f3b2f95a67c87098fabf6d88068ef7e235e717bec26024a3b342c5dba940b8600799cef0791 - sha512sums = 8d232afccf84e24348c0e13d8eb34bcf670ca98a8e6a1e17cd4e861b8c036db1431ad8d8cb3942fb7645489d450dc2dbb91d54c18275796be26aae3ec53db557 - sha512sums = 9940448b4a83c9a837a916557b413b4523097554175420e554e039baa0395a387634bdf4486c212b930942a32e4f336b65e3d6624517b3e134b010a614fbcb41 - sha512sums = 1cdcff2b4ade4a227e55dce33457f6974cf1fd3352766d731b5e7a372239c211bd5c105e3fa46f48b6b2456d04471da9d1adfa12d99444802e4d06febbd4b38f - sha512sums = bba154e13463fb759e1cfd5f461b2b4e786ad8c6f4cacacbd918e911efc7d5a5368300676d6e6d8e9b7b2f4333314886bb1e34daac9f0c73c1c441baf7918063 + sha512sums = 947587274ac11d4186b28c3894298da615ca1f72e56ba8278fb647a0068f38e84bd68720015caba9881219605296a19633674217b3fe89b5ff699791938a0ab7 pkgname = dracut diff --git a/dracut/PKGBUILD b/dracut/PKGBUILD index 07aa80dd..8e13c791 100644 --- a/dracut/PKGBUILD +++ b/dracut/PKGBUILD @@ -3,8 +3,9 @@ # Contributor: SoulHarsh007 pkgname=dracut -pkgver=059 -pkgrel=5.3 +_pkgname=dracut-canary +pkgver=060 +pkgrel=0.1 pkgdesc="An event driven initramfs infrastructure" arch=('x86_64') url="https://dracut.wiki.kernel.org" @@ -41,7 +42,7 @@ optdepends=( ) provides=('initramfs') backup=('etc/dracut.conf' 'etc/dracut-cachyos.conf') -source=("https://github.com/dracutdevs/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz" +source=("https://github.com/dracutdevs-extra/dracut-canary/archive/$pkgver/$pkgname-$pkgver.tar.gz" "dracut-rebuild" "dracut-install" "dracut-remove" @@ -50,13 +51,9 @@ source=("https://github.com/dracutdevs/$pkgname/archive/$pkgver/$pkgname-$pkgver "dracut-cachyos.conf" "snapshot-overlay.sh" "module-setup.sh" - "dracut-systemd-253.patch" - "dracut-systemd-254-uki.patch::https://github.com/dracutdevs/dracut/commit/f32e95bcadbc5158843530407adc1e7b700561b1.patch" - "dracut-systemd-255-systemd-executor.patch::https://github.com/dracutdevs/dracut/pull/2535/commits/62fd8ebe4776dbb60ca04a865c2d160e45d65e91.patch" - "dracut-systemd-255-pcrphase.patch" - "dracut-systemd-255-hibernate-resume.patch::https://github.com/dracutdevs/dracut/pull/2527/commits/a2fe89116db4b286fbf515f26bd1773b5e6ee8ad.patch") + "dracut-systemd-255-pcrphase.patch") -sha512sums=('196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d' +sha512sums=('3a1df3ef830638fe118048b06f055332b3c51d32b6dffad7b90da674be5b646aa3161891115c92a711e05e32f99e6f682ac31eaddbeb537d9710c0729e0d2da1' '6457ce228e78e1d7f07eafec6f37484264004e53e170b357093d2a92c024588bc28a4c4664539e7ca42a6e6838f156ca7cb047f3b8c927228d6ead2a43786d2f' 'f298693ee1a637329b1a38c746151c2ae8d2ae431f894c3001f55d812a2a20a68907ffa0b04ba748c18a2898cc30e0f49e75d0d13c7dd453129304f3cfd4621e' 'd687dd7951ffabe696a2f6b5f27d8446173c61f5c744f447065045c702c24c0bd89eb610c6a3ec0f56c5afb8aeff2199a1c2bfd7926f0a5f817e0f53c3c92529' @@ -65,17 +62,13 @@ sha512sums=('196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af3 '3fb23adbf462d655638a6a5a3083b464150b05b088e9139fceda500ba7560a29eb90d0e4dab896a257264fc6e72ec537a0519ad4e4e25e4c44b2dc3263cb5a52' 'cd755060b6a2c534f8ee5ec9d1fff18ee71250db1ab4105fc9df4c28e1634fad031944b94790da8b29f296e013631bd61731423c1f847e95b1bd415a7a5ca4a5' '461231a756b6bc250fb973a5b4b6fbc0b2d6f8dae0dbc89a37bab17745dcfe38d9ae6cfe58bd4b9c4661e5f0024577ad9e4aa1d3c16169e7a83744da4b9068a5' - 'dfbef5ee06fd0f7b51bfd3571eb284272d7694754eaf232cf1a14f3b2f95a67c87098fabf6d88068ef7e235e717bec26024a3b342c5dba940b8600799cef0791' - '8d232afccf84e24348c0e13d8eb34bcf670ca98a8e6a1e17cd4e861b8c036db1431ad8d8cb3942fb7645489d450dc2dbb91d54c18275796be26aae3ec53db557' - '9940448b4a83c9a837a916557b413b4523097554175420e554e039baa0395a387634bdf4486c212b930942a32e4f336b65e3d6624517b3e134b010a614fbcb41' - '1cdcff2b4ade4a227e55dce33457f6974cf1fd3352766d731b5e7a372239c211bd5c105e3fa46f48b6b2456d04471da9d1adfa12d99444802e4d06febbd4b38f' - 'bba154e13463fb759e1cfd5f461b2b4e786ad8c6f4cacacbd918e911efc7d5a5368300676d6e6d8e9b7b2f4333314886bb1e34daac9f0c73c1c441baf7918063') + '947587274ac11d4186b28c3894298da615ca1f72e56ba8278fb647a0068f38e84bd68720015caba9881219605296a19633674217b3fe89b5ff699791938a0ab7') validpgpkeys=( '7F3D64824AC0B6B8009E50504BC0896FB5693595' # Harald Hoyer ) prepare() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/${_pkgname}-${pkgver}" local src for src in "${source[@]}"; do @@ -90,7 +83,7 @@ prepare() { build() { local prefix=/usr sysconfdir=/etc - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/${_pkgname}-${pkgver}" ./configure \ --sysconfdir=${sysconfdir} \ @@ -102,7 +95,7 @@ build() { } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/${_pkgname}-${pkgver}" DESTDIR="$pkgdir" make install install -Dm644 "${srcdir}/90-dracut-install.hook" "${pkgdir}/usr/share/libalpm/hooks/90-dracut-install.hook" diff --git a/dracut/dracut-systemd-253.patch b/dracut/dracut-systemd-253.patch deleted file mode 100644 index bf40eace..00000000 --- a/dracut/dracut-systemd-253.patch +++ /dev/null @@ -1,225 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Mon, 9 Jan 2023 11:47:06 +0100 -Subject: [PATCH 1/4] fix(dracut-systemd): remove unused argument - -The `generator_wait_for_dev` function of the dracut rootfs systemd generator -only uses the first argument. Moreover, RDRETRY is unset at this point. - -(cherry picked from commit eb75861c2a1c05eb142616da1891a7fa5a2a34e1) ---- - modules.d/98dracut-systemd/rootfs-generator.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/98dracut-systemd/rootfs-generator.sh b/modules.d/98dracut-systemd/rootfs-generator.sh -index e1d365df..3238b495 100755 ---- a/modules.d/98dracut-systemd/rootfs-generator.sh -+++ b/modules.d/98dracut-systemd/rootfs-generator.sh -@@ -104,7 +104,7 @@ esac - GENERATOR_DIR="$1" - - if [ "$rootok" = "1" ]; then -- generator_wait_for_dev "${root#block:}" "$RDRETRY" -+ generator_wait_for_dev "${root#block:}" - generator_fsck_after_pre_mount "${root#block:}" - strstr "$(cat /proc/cmdline)" 'root=' || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)" - fi - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Wed, 1 Mar 2023 11:21:16 +0100 -Subject: [PATCH 2/4] fix(dracut-systemd): do not hardcode the systemd - generator directory - -The normal directory is the first argument passed to the systemd generator, -so use it instead of hardcoding /run/systemd/generator. - -(cherry picked from commit a2b32ed976898188bc98d9b6c7eec3dc45f4abf0) ---- - modules.d/98dracut-systemd/rootfs-generator.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules.d/98dracut-systemd/rootfs-generator.sh b/modules.d/98dracut-systemd/rootfs-generator.sh -index 3238b495..5b85d8c5 100755 ---- a/modules.d/98dracut-systemd/rootfs-generator.sh -+++ b/modules.d/98dracut-systemd/rootfs-generator.sh -@@ -17,7 +17,7 @@ generator_wait_for_dev() { - # after remote-fs-pre.target since the initqueue is ordered before it so - # it will never actually show up (think Tang-pinned rootfs). - cat > "$hookdir/initqueue/finished/devexists-${_name}.sh" << EOF --if ! grep -q After=remote-fs-pre.target /run/systemd/generator/systemd-cryptsetup@*.service 2>/dev/null; then -+if ! grep -q After=remote-fs-pre.target "$GENERATOR_DIR"/systemd-cryptsetup@*.service 2>/dev/null; then - [ -e "$1" ] - fi - EOF -@@ -77,12 +77,12 @@ generator_fsck_after_pre_mount() { - [ -z "$1" ] && return 0 - - _name=$(dev_unit_name "$1") -- [ -d /run/systemd/generator/systemd-fsck@"${_name}".service.d ] || mkdir -p /run/systemd/generator/systemd-fsck@"${_name}".service.d -- if ! [ -f /run/systemd/generator/systemd-fsck@"${_name}".service.d/after-pre-mount.conf ]; then -+ [ -d "$GENERATOR_DIR"/systemd-fsck@"${_name}".service.d ] || mkdir -p "$GENERATOR_DIR"/systemd-fsck@"${_name}".service.d -+ if ! [ -f "$GENERATOR_DIR"/systemd-fsck@"${_name}".service.d/after-pre-mount.conf ]; then - { - echo "[Unit]" - echo "After=dracut-pre-mount.service" -- } > /run/systemd/generator/systemd-fsck@"${_name}".service.d/after-pre-mount.conf -+ } > "$GENERATOR_DIR"/systemd-fsck@"${_name}".service.d/after-pre-mount.conf - fi - - } - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Wed, 1 Mar 2023 12:07:29 +0100 -Subject: [PATCH 3/4] fix(dracut-systemd): check and create generator dir - outside of inner function - -(cherry picked from commit e21f8f7d5abaae37ada8c7a6dc91c2d878e0b501) ---- - modules.d/98dracut-systemd/rootfs-generator.sh | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/modules.d/98dracut-systemd/rootfs-generator.sh b/modules.d/98dracut-systemd/rootfs-generator.sh -index 5b85d8c5..c3f60ad4 100755 ---- a/modules.d/98dracut-systemd/rootfs-generator.sh -+++ b/modules.d/98dracut-systemd/rootfs-generator.sh -@@ -51,7 +51,6 @@ generator_mount_rootfs() { - [ -z "$1" ] && return 0 - - _name=$(dev_unit_name "$1") -- [ -d "$GENERATOR_DIR" ] || mkdir -p "$GENERATOR_DIR" - if ! [ -f "$GENERATOR_DIR"/sysroot.mount ]; then - { - echo "[Unit]" -@@ -101,9 +100,11 @@ case "${root#block:}" in - ;; - esac - --GENERATOR_DIR="$1" -- - if [ "$rootok" = "1" ]; then -+ GENERATOR_DIR="$1" -+ [ -z "$GENERATOR_DIR" ] && exit 1 -+ [ -d "$GENERATOR_DIR" ] || mkdir -p "$GENERATOR_DIR" -+ - generator_wait_for_dev "${root#block:}" - generator_fsck_after_pre_mount "${root#block:}" - strstr "$(cat /proc/cmdline)" 'root=' || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)" - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Fri, 3 Mar 2023 16:06:30 +0100 -Subject: [PATCH 4/4] fix(dracut-systemd): rootfs-generator cannot write - outside of generator dir - -Altough it was already documented in systemd.generator(7) that generators must -not write to locations other than those passed as arguments, since -https://github.com/systemd/systemd/commit/ca6ce62d systemd executes generators -in a mount namespace "sandbox", so now the hooks created by the rootfs-generator -are lost. - -These hooks are created using the root= cmdline argument, so this patch moves -the creation of these hooks to a cmdline hook. - -Fixes issue #2211 -Fixes issue #2225 - -(cherry picked from commit 4bde75fabe31a5c048fd75e533b94e91c3faa83b) ---- - modules.d/98dracut-systemd/module-setup.sh | 2 + - .../98dracut-systemd/parse-root.sh (new +x) | 38 +++++++++++++++++++ - .../98dracut-systemd/rootfs-generator.sh | 20 +--------- - 3 files changed, 41 insertions(+), 19 deletions(-) - -diff --git a/modules.d/98dracut-systemd/module-setup.sh b/modules.d/98dracut-systemd/module-setup.sh -index b7da86db..e66fc956 100755 ---- a/modules.d/98dracut-systemd/module-setup.sh -+++ b/modules.d/98dracut-systemd/module-setup.sh -@@ -37,6 +37,8 @@ install() { - - inst_script "$moddir/rootfs-generator.sh" "$systemdutildir"/system-generators/dracut-rootfs-generator - -+ inst_hook cmdline 10 "$moddir/parse-root.sh" -+ - for i in \ - dracut-cmdline.service \ - dracut-cmdline-ask.service \ -diff --git a/modules.d/98dracut-systemd/parse-root.sh b/modules.d/98dracut-systemd/parse-root.sh -new file mode 100755 -index 00000000..deeeff3f ---- /dev/null -+++ b/modules.d/98dracut-systemd/parse-root.sh -@@ -0,0 +1,38 @@ -+#!/bin/sh -+ -+type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh -+ -+root=$(getarg root=) -+case "${root#block:}" in -+ LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*) -+ root="block:$(label_uuid_to_dev "$root")" -+ rootok=1 -+ ;; -+ /dev/nfs) # ignore legacy /dev/nfs -+ ;; -+ /dev/*) -+ root="block:${root}" -+ rootok=1 -+ ;; -+esac -+ -+if [ "$rootok" = "1" ]; then -+ root_dev="${root#block:}" -+ root_name="$(str_replace "$root_dev" '/' '\x2f')" -+ if ! [ -e "$hookdir/initqueue/finished/devexists-${root_name}.sh" ]; then -+ -+ # If a LUKS device needs unlocking via systemd in the initrd, assume -+ # it's for the root device. In that case, don't block on it if it's -+ # after remote-fs-pre.target since the initqueue is ordered before it so -+ # it will never actually show up (think Tang-pinned rootfs). -+ cat > "$hookdir/initqueue/finished/devexists-${root_name}.sh" << EOF -+if ! grep -q After=remote-fs-pre.target /run/systemd/generator/systemd-cryptsetup@*.service 2>/dev/null; then -+ [ -e "$root_dev" ] -+fi -+EOF -+ { -+ printf '[ -e "%s" ] || ' "$root_dev" -+ printf 'warn "\"%s\" does not exist"\n' "$root_dev" -+ } >> "$hookdir/emergency/80-${root_name}.sh" -+ fi -+fi -diff --git a/modules.d/98dracut-systemd/rootfs-generator.sh b/modules.d/98dracut-systemd/rootfs-generator.sh -index c3f60ad4..bcfd2b89 100755 ---- a/modules.d/98dracut-systemd/rootfs-generator.sh -+++ b/modules.d/98dracut-systemd/rootfs-generator.sh -@@ -6,28 +6,10 @@ generator_wait_for_dev() { - local _name - local _timeout - -- _name="$(str_replace "$1" '/' '\x2f')" -+ _name=$(dev_unit_name "$1") - _timeout=$(getarg rd.timeout) - _timeout=${_timeout:-0} - -- if ! [ -e "$hookdir/initqueue/finished/devexists-${_name}.sh" ]; then -- -- # If a LUKS device needs unlocking via systemd in the initrd, assume -- # it's for the root device. In that case, don't block on it if it's -- # after remote-fs-pre.target since the initqueue is ordered before it so -- # it will never actually show up (think Tang-pinned rootfs). -- cat > "$hookdir/initqueue/finished/devexists-${_name}.sh" << EOF --if ! grep -q After=remote-fs-pre.target "$GENERATOR_DIR"/systemd-cryptsetup@*.service 2>/dev/null; then -- [ -e "$1" ] --fi --EOF -- { -- printf '[ -e "%s" ] || ' "$1" -- printf 'warn "\"%s\" does not exist"\n' "$1" -- } >> "$hookdir/emergency/80-${_name}.sh" -- fi -- -- _name=$(dev_unit_name "$1") - if ! [ -L "$GENERATOR_DIR"/initrd.target.wants/"${_name}".device ]; then - [ -d "$GENERATOR_DIR"/initrd.target.wants ] || mkdir -p "$GENERATOR_DIR"/initrd.target.wants - ln -s ../"${_name}".device "$GENERATOR_DIR"/initrd.target.wants/"${_name}".device diff --git a/dracut/dracut-systemd-255-pcrphase.patch b/dracut/dracut-systemd-255-pcrphase.patch index e3e830b5..4eba467b 100644 --- a/dracut/dracut-systemd-255-pcrphase.patch +++ b/dracut/dracut-systemd-255-pcrphase.patch @@ -1,4 +1,4 @@ -From cd93aaa2e096a8cbd1f1789dcce06857067b35c9 Mon Sep 17 00:00:00 2001 +From ad08007f25baddde2789ed4958fff7c76687eb9a Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Mon, 11 Dec 2023 17:10:20 -0800 Subject: [PATCH] fix(systemd-255): handle systemd-pcr{phase -> extend} rename @@ -15,12 +15,12 @@ Signed-off-by: Brian Harring 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh -index fa960a42c1..87efd0c1a6 100755 +index fa960a42..87efd0c1 100755 --- a/modules.d/01systemd-pcrphase/module-setup.sh +++ b/modules.d/01systemd-pcrphase/module-setup.sh @@ -6,7 +6,11 @@ check() { - + # If the binary(s) requirements are not fulfilled the module can't be installed. - require_binaries "$systemdutildir"/systemd-pcrphase || return 1 + # systemd-255 renamed the binary, check for old and new location. @@ -28,14 +28,17 @@ index fa960a42c1..87efd0c1a6 100755 + ! require_binaries "$systemdutildir"/systemd-pcrextend; then + return 1 + fi - + # Return 255 to only include the module, if another module requires it. return 255 @@ -28,6 +32,7 @@ install() { - + inst_multiple -o \ "$systemdutildir"/systemd-pcrphase \ + "$systemdutildir"/systemd-pcrextend \ - "$systemdsystemunitdir"/systemd-pcrphase.service \ - "$systemdsystemunitdir/systemd-pcrphase.service.d/*.conf" \ - "$systemdsystemunitdir"/systemd-pcrphase-sysinit.service + "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \ + "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \ + "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service +-- +2.43.0.232.ge79552d197 +