Fix checking for NVMe plugin availability

Resolves: RHEL-45179
This commit is contained in:
Vojtech Trefny 2024-09-30 14:28:40 +02:00
parent 4a23a9cf98
commit 6d59649470
2 changed files with 33 additions and 1 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

@ -5,7 +5,7 @@ Version: 3.10.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: 6%{?prerelease}%{?dist} Release: 7%{?prerelease}%{?dist}
Epoch: 1 Epoch: 1
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
%global realname blivet %global realname blivet
@ -22,6 +22,7 @@ Patch2: 0003-XFS-resize-test-fix.patch
Patch3: 0004-Run-mkfs-xfs-with-force-option-by-default.patch Patch3: 0004-Run-mkfs-xfs-with-force-option-by-default.patch
Patch4: 0005-consolidated-s390-device-configuration.patch Patch4: 0005-consolidated-s390-device-configuration.patch
Patch5: 0006-Remove-support-for-the-MD-linear-RAID-level.patch Patch5: 0006-Remove-support-for-the-MD-linear-RAID-level.patch
Patch6: 0007-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).
@ -119,6 +120,10 @@ make DESTDIR=%{buildroot} install
%{python3_sitelib}/* %{python3_sitelib}/*
%changelog %changelog
* Mon Sep 30 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.10.0-7
- Fix checking for NVMe plugin availability
Resolves: RHEL-45179
* Mon Sep 09 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.10.0-6 * Mon Sep 09 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.10.0-6
- Remove support for the MD linear RAID level - Remove support for the MD linear RAID level
Resolves: RHEL-38386 Resolves: RHEL-38386