Skip to content

Commit

Permalink
fix(systemd-verity): incorrect reference to cryptsetup target
Browse files Browse the repository at this point in the history
Incorrect include of remote-cryptsetup.target in hostonly.
Corrected to point to remote-veritysetup.target
  • Loading branch information
johannbg authored and haraldh committed Apr 27, 2021
1 parent 0267f3c commit ba92d1f
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dracut.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
60 changes: 60 additions & 0 deletions modules.d/01systemd-veritysetup/module-setup.sh
Original file line number Diff line number Diff line change
@@ -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.*"

}

0 comments on commit ba92d1f

Please sign in to comment.