Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 55dd24711be711763b5eca2dcaa23d0c17bbe6cc Mon Sep 17 00:00:00 2001
From: Owen Xie <15828145+nfusionz@users.noreply.github.com>
Date: Sun, 31 May 2026 04:20:11 -0400
Subject: [PATCH 1/2] dracut: avoid requiring systemd-reply-password at build
time

Fixes dracut module issue in non-systemd environments where
systemd-reply-password.path() is called when it doesn't exist,
causing an error. The path isn't used for the non-systemd flow.
---
src/luks/dracut/clevis/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luks/dracut/clevis/meson.build b/src/luks/dracut/clevis/meson.build
index f37cc3c..e6230f3 100644
--- a/src/luks/dracut/clevis/meson.build
+++ b/src/luks/dracut/clevis/meson.build
@@ -5,7 +5,7 @@ if dracut.found()

dracut_data = configuration_data()
dracut_data.merge_from(data)
- dracut_data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.path())
+ dracut_data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.found() ? sd_reply_pass.path() : '')

configure_file(
input: 'module-setup.sh.in',
--
2.54.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From a575ea0337878708766cd074a14ea5d8be32d360 Mon Sep 17 00:00:00 2001
From: Owen Xie <15828145+nfusionz@users.noreply.github.com>
Date: Sun, 31 May 2026 18:43:31 -0400
Subject: [PATCH 2/2] dracut: include chmod for password unlocker

Fixes issue in non-systemd environments that may not
have chmod included in the init environment already.
---
src/luks/dracut/clevis/module-setup.sh.in | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/luks/dracut/clevis/module-setup.sh.in b/src/luks/dracut/clevis/module-setup.sh.in
index 32fac41..cb0bd22 100755
--- a/src/luks/dracut/clevis/module-setup.sh.in
+++ b/src/luks/dracut/clevis/module-setup.sh.in
@@ -52,6 +52,7 @@ install() {
inst_script "$moddir"/clevis-password-unlocker-prepare /bin/clevis-password-unlocker-prepare
inst_multiple \
clevis-luks-unlock \
+ chmod \
blkid
fi

--
2.54.0

11 changes: 7 additions & 4 deletions srcpkgs/clevis/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Template file for 'clevis'
pkgname=clevis
version=20
revision=2
version=23
revision=1
# Holds non-standard upstream version suffixes when needed.
_subversion=tpm1u1

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this suffix come from?

build_style=meson
hostmakedepends="asciidoc bash-completion cryptsetup curl jq keyutils pkg-config tpm2-tools"
makedepends="bash-completion cryptsetup-devel dracut jansson-devel
Expand All @@ -11,9 +13,10 @@
maintainer="Johannes Heimansberg <git@jhe.dedyn.io>"
license="GPL-3.0-or-later WITH custom:OpenSSL-Exception"
homepage="https://github.com/latchset/clevis"
distfiles="https://github.com/latchset/clevis/archive/v$version/clevis-$version.tar.gz"
checksum=67eb9cbbb9c90f9802cae76503f74f23d0046ee6570553407035e9fae3b4b4dd
distfiles="https://github.com/latchset/clevis/archive/v${version}${subversion}/clevis-${version}${subversion}.tar.gz"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't actually use the suffix you added. The variable is _subversion, not subversion.

checksum=a8a09f148d54d91aa0d21c5fa508dd1446c2a200be7679fbf6e7d19196aec164
make_check="ci-skip" # LUKS tests fail in CI pipeline

Check failure on line 18 in srcpkgs/clevis/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint

Place make_check= after configure_args=
configure_args="-Db_ndebug=false"

post_install() {
vlicense COPYING.openssl
Expand Down
Loading