diff --git a/ignition.spec b/ignition.spec index 8093b0b..87f8d2b 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.13.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 5%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -28,6 +28,9 @@ URL: %{gourl} Source0: %{gosource} # https://github.com/coreos/ignition/pull/1307 Patch0: luks-volume-reuse.patch +# vmware: kernel_lockdown breaks guestinfo fetching +# https://github.com/coreos/ignition/issues/1092 +Patch1: vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch BuildRequires: libblkid-devel @@ -329,6 +332,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Thu Mar 17 2022 Sohan Kunkerkar - 2.13.0-5 +- Avoid kernel lockdown on VMware when running with secure boot + * Fri Jan 28 2022 Benjamin Gilbert - 2.13.0-4 - Rename -validate-nonlinux subpackage to -validate-redistributable - Add static Linux binaries to -redistributable diff --git a/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch b/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch new file mode 100644 index 0000000..6d43fe9 --- /dev/null +++ b/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch @@ -0,0 +1,40 @@ +From 069ab246129be6860aed3389c526543afa87e712 Mon Sep 17 00:00:00 2001 +From: Luca BRUNO +Date: Thu, 17 Sep 2020 16:07:59 +0000 +Subject: [PATCH] vendor/vmw-guestinfo: quickfix to skip performing iopl + +This is a quickfix to avoid performing an `iopl`, which is blocked by +kernel_lockdown under SecureBoot. + +Refs: + * https://bugzilla.redhat.com/show_bug.cgi?id=1877995 + * https://github.com/lucab/vmw_backdoor-rs/issues/6 + * https://github.com/coreos/ignition/issues/1092 +--- + .../vmware/vmw-guestinfo/vmcheck/vmcheck.go | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go b/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go +index c46cc5e4..ffd866c0 100644 +--- a/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go ++++ b/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go +@@ -41,10 +41,13 @@ func IsVirtualWorld() (bool, error) { + + // hypervisorPortCheck tests the availability of the HV port. + func hypervisorPortCheck() (bool, error) { +- // Privilege level 3 to access all ports above 0x3ff +- if err := openPortsAccess(); err != nil { +- return false, err +- } ++ // XXX(lucab): quickfix for https://github.com/coreos/ignition/issues/1092. ++ /* ++ // Privilege level 3 to access all ports above 0x3ff ++ if err := openPortsAccess(); err != nil { ++ return false, err ++ } ++ */ + + p := &bdoor.BackdoorProto{} + +-- +2.21.1