Fix checking for NVMe plugin availability

Resolves: RHEL-28124
This commit is contained in:
Vojtech Trefny 2024-09-23 10:26:30 +02:00
parent bfa1c52b53
commit 8a6573b516
2 changed files with 35 additions and 3 deletions

View File

@ -0,0 +1,27 @@
From 7677fc312b821a9c67750220f2494d06f2357780 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 18 Sep 2024 15:30:05 +0200
Subject: [PATCH] Fix checking for NVMe plugin availability
---
blivet/nvme.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/blivet/nvme.py b/blivet/nvme.py
index 4309dea3..72a47070 100644
--- a/blivet/nvme.py
+++ b/blivet/nvme.py
@@ -76,6 +76,10 @@ class NVMe(object):
return False
if not hasattr(blockdev.NVMETech, "FABRICS"):
return False
+ try:
+ blockdev.nvme.is_tech_avail(blockdev.NVMETech.FABRICS, 0) # pylint: disable=no-member
+ except (blockdev.BlockDevNotImplementedError, blockdev.NVMEError):
+ return False
return True
def startup(self):
--
2.46.1

View File

@ -23,7 +23,7 @@ Version: 3.6.0
#%%global prerelease .b2 #%%global prerelease .b2
# prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
Release: 18%{?prerelease}%{?dist} Release: 19%{?prerelease}%{?dist}
Epoch: 1 Epoch: 1
License: LGPLv2+ License: LGPLv2+
%global realname blivet %global realname blivet
@ -56,7 +56,8 @@ Patch22: 0023-Do-not-add-new-PVs-to-the-LVM-devices-file-if-it-doe.patch
Patch23: 0024-Added-support-for-PV-grow.patch Patch23: 0024-Added-support-for-PV-grow.patch
Patch24: 0025-Stratis-fixes-backport.patch Patch24: 0025-Stratis-fixes-backport.patch
Patch25: 0026-XFS-resize-test-fix.patch Patch25: 0026-XFS-resize-test-fix.patch
PAtch26: 0027-RHEL96-bugfixes-1.patch Patch26: 0027-RHEL96-bugfixes-1.patch
Patch27: 0028-Fix-checking-for-NVMe-plugin-availability.patch
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
@ -220,7 +221,11 @@ configuration.
%endif %endif
%changelog %changelog
* Mon Sep 09 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-17 * Mon Sep 23 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-19
- Fix checking for NVMe plugin availability
Resolves: RHEL-28124
* Mon Sep 09 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-18
- Add a basic read-only support for UDF filesystem - Add a basic read-only support for UDF filesystem
Resolves: RHEL-13329 Resolves: RHEL-13329
- nvme: Skip startup/write when NVMe plugin isn't available - nvme: Skip startup/write when NVMe plugin isn't available