fix(systemd-verity): incorrect reference to cryptsetup target

Incorrect include of remote-cryptsetup.target in hostonly.
Corrected to point to remote-veritysetup.target

diff --git a/dracut.spec b/dracut.spec
index 42f7e8ffd7830c274c9e5556856f960fd6ebf528..fa78680c3fcd96d85dedabd35447caab18b96567 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -335,7 +335,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{dracutlibdir}/modules.d/01systemd-sysusers
 %{dracutlibdir}/modules.d/01systemd-timedated
 %{dracutlibdir}/modules.d/01systemd-timesyncd
-%{dracutlibdir}/modules.d/01systemd-verity
+%{dracutlibdir}/modules.d/01systemd-veritysetup
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog

diff --git a/modules.d/01systemd-veritysetup/module-setup.sh b/modules.d/01systemd-veritysetup/module-setup.sh
new file mode 100755 (executable)
index 0000000..fecfecc
--- /dev/null
+++ b/modules.d/01systemd-veritysetup/module-setup.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Prerequisite check(s) for module.
+check() {
+
+    # If the binary(s) requirements are not fulfilled the module can't be installed.
+    require_binaries \
+        "$systemdutildir"/systemd-veritysetup \
+        "$systemdutildir"/system-generators/systemd-veritysetup-generator \
+        || return 1
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
+}
+
+# Module dependency requirements.
+depends() {
+
+    # This module has external dependency on other module(s).
+    echo systemd dm
+    # Return 0 to include the dependent module(s) in the initramfs.
+    return 0
+
+}
+
+# Install the required file(s) and directories for the module in the initramfs.
+install() {
+
+    inst_multiple -o \
+        "$systemdutildir"/systemd-veritysetup \
+        "$systemdutildir"/system-generators/systemd-veritysetup-generator \
+        "$systemdsystemunitdir"/remote-veritysetup.target \
+        "$systemdsystemunitdir"/veritysetup-pre.target \
+        "$systemdsystemunitdir"/veritysetup.target \
+        "$systemdsystemunitdir"/sysinit.target.wants/veritysetup.target \
+        "$systemdsystemunitdir"/initrd-root-device.target.wants/remote-veritysetup.target
+
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o \
+            /etc/veritytab \
+            "$systemdsystemconfdir"/veritysetup.target \
+            "$systemdsystemconfdir/veritysetup.target.wants/*.target" \
+            "$systemdsystemconfdir"/veritysetup-pre.target \
+            "$systemdsystemconfdir/veritysetup-pre.target.wants/*.target" \
+            "$systemdsystemconfdir"/remote-veritysetup.target \
+            "$systemdsystemconfdir/remote-veritysetup.target.wants/*.target" \
+            "$systemdsystemconfdir"/sysinit.target.wants/veritysetup.target \
+            "$systemdsystemconfdir/sysinit.target.wants/veritysetup.target.wants/*.target" \
+            "$systemdsystemconfdir"/initrd-root-device.target.wants/remote-veritysetup.target
+    fi
+
+    # Install required libraries.
+    _arch=${DRACUT_ARCH:-$(uname -m)}
+    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libcryptsetup.so.*"
+
+}