From 8da96d598108e04a897982c82874e33eb16ed36c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 6 Dec 2018 13:44:49 +0000 Subject: [PATCH] Update patch for work around --- ...-1-for-the-time-being-so-tpm2-unlock-.patch | 18 ++++++++++++------ clevis.spec | 5 ++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/0001-Drop-rd.neednet-1-for-the-time-being-so-tpm2-unlock-.patch b/0001-Drop-rd.neednet-1-for-the-time-being-so-tpm2-unlock-.patch index 1677069..4536cf9 100644 --- a/0001-Drop-rd.neednet-1-for-the-time-being-so-tpm2-unlock-.patch +++ b/0001-Drop-rd.neednet-1-for-the-time-being-so-tpm2-unlock-.patch @@ -1,6 +1,6 @@ -From 3bf5ce692612fe96427d221b3dbdf3936a9dccb8 Mon Sep 17 00:00:00 2001 +From b0ade8201b508d74f38488e08a31d93117894d83 Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Thu, 6 Dec 2018 11:33:41 +0000 +Date: Thu, 6 Dec 2018 13:42:33 +0000 Subject: [PATCH] Drop rd.neednet=1 for the time being so tpm2 unlock will work without network @@ -13,14 +13,20 @@ https://github.com/latchset/clevis/issues/54 Signed-off-by: Peter Robinson --- - src/luks/systemd/dracut/module-setup.sh.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/luks/systemd/dracut/module-setup.sh.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/luks/systemd/dracut/module-setup.sh.in b/src/luks/systemd/dracut/module-setup.sh.in -index 990bf4a..c2932d9 100755 +index 990bf4a..399e468 100755 --- a/src/luks/systemd/dracut/module-setup.sh.in +++ b/src/luks/systemd/dracut/module-setup.sh.in -@@ -24,7 +24,7 @@ depends() { +@@ -19,12 +19,12 @@ + # + + depends() { +- echo crypt systemd network ++ echo crypt systemd + return 0 } cmdline() { diff --git a/clevis.spec b/clevis.spec index 189f311..95a2d3f 100644 --- a/clevis.spec +++ b/clevis.spec @@ -2,7 +2,7 @@ Name: clevis Version: 11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Automated decryption framework License: GPLv3+ @@ -160,6 +160,9 @@ exit 0 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2 %changelog +* Thu Dec 6 2018 Peter Robinson 11-4 +- Update patch for work around + * Thu Dec 6 2018 Peter Robinson 11-3 - Work around network requirement for early boot