diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 14:01:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 14:01:36 +0000 |
| commit | 70de5d4041249c1a0f597714398cc245f59495c6 (patch) | |
| tree | ff491e31b95b662ca6c481ac49d1ca8a94c0226b /modules.d/01systemd-pcrphase/module-setup.sh | |
| parent | Adding debian version 060+5-8. (diff) | |
| download | dracut-70de5d4041249c1a0f597714398cc245f59495c6.tar.xz dracut-70de5d4041249c1a0f597714398cc245f59495c6.zip | |
Merging upstream version 102.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules.d/01systemd-pcrphase/module-setup.sh')
| -rwxr-xr-x | modules.d/01systemd-pcrphase/module-setup.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh index fa960a4..eb85207 100755 --- a/modules.d/01systemd-pcrphase/module-setup.sh +++ b/modules.d/01systemd-pcrphase/module-setup.sh @@ -6,10 +6,13 @@ 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. + if ! require_binaries "$systemdutildir"/systemd-pcrphase \ + && ! require_binaries "$systemdutildir"/systemd-pcrextend; then + return 1 + fi - # Return 255 to only include the module, if another module requires it. - return 255 + return 0 } @@ -28,6 +31,7 @@ install() { inst_multiple -o \ "$systemdutildir"/systemd-pcrphase \ + "$systemdutildir"/systemd-pcrextend \ "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \ "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \ "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service |