drop the rd.neednet for the time being

This commit is contained in:
Peter Robinson 2019-10-31 16:07:08 +00:00
parent 0f1aa4e16b
commit b1fb02f6fe
2 changed files with 4 additions and 42 deletions

View File

@ -1,40 +0,0 @@
From b0ade8201b508d74f38488e08a31d93117894d83 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
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
This is a temporary hack while a proper upstream fix is worked out to allow
tang and tpm2 configurations to co-exist.
Being tracked in:
https://bugzilla.redhat.com/show_bug.cgi?id=1628258
https://github.com/latchset/clevis/issues/54
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
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..399e468 100755
--- a/src/luks/systemd/dracut/module-setup.sh.in
+++ b/src/luks/systemd/dracut/module-setup.sh.in
@@ -19,12 +19,12 @@
#
depends() {
- echo crypt systemd network
+ echo crypt systemd
return 0
}
cmdline() {
- echo "rd.neednet=1"
+ echo ""
}
install() {
--
2.19.2

View File

@ -2,7 +2,7 @@
Name: clevis Name: clevis
Version: 11 Version: 11
Release: 7%{?dist} Release: 8%{?dist}
Summary: Automated decryption framework Summary: Automated decryption framework
License: GPLv3+ License: GPLv3+
@ -12,7 +12,6 @@ Source0: https://github.com/latchset/%{name}/releases/download/v%{version
Patch0: Delete-remaining-references-to-the-removed-http-pin.patch Patch0: Delete-remaining-references-to-the-removed-http-pin.patch
Patch1: Install-cryptsetup-and-tpm2_pcrlist-in-the-initramfs.patch Patch1: Install-cryptsetup-and-tpm2_pcrlist-in-the-initramfs.patch
Patch2: Add-device-TCTI-library-to-the-initramfs.patch Patch2: Add-device-TCTI-library-to-the-initramfs.patch
Patch3: 0001-Drop-rd.neednet-1-for-the-time-being-so-tpm2-unlock-.patch
# Support for tpm2-tools 4.0, backported from the following pull-request: # Support for tpm2-tools 4.0, backported from the following pull-request:
# https://github.com/latchset/clevis/pull/114 # https://github.com/latchset/clevis/pull/114
Patch4: clevis-encrypt-tpm2-fix-TPM-object-attributes.patch Patch4: clevis-encrypt-tpm2-fix-TPM-object-attributes.patch
@ -165,6 +164,9 @@ exit 0
%attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
%changelog %changelog
* Wed Oct 30 2019 Peter Robinson <pbrobinson@fedoraproject.org> 11-8
- Drop need network patch
* Fri Sep 06 2019 Javier Martinez Canillas <javierm@redhat.com> - 11-7 * Fri Sep 06 2019 Javier Martinez Canillas <javierm@redhat.com> - 11-7
- Add support for tpm2-tools 4.0 - Add support for tpm2-tools 4.0