From 49d1209d547f2bcb783df3fbdfadcba95688963f Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 23 May 2024 15:31:47 +0200 Subject: [PATCH 1/2] Remove support for the MD linear RAID level The md-linear kernel module is deprecated and will be removed in the future. --- blivet/devicelibs/mdraid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py index 3b60c87c4..0ef3d0a4f 100644 --- a/blivet/devicelibs/mdraid.py +++ b/blivet/devicelibs/mdraid.py @@ -45,6 +45,6 @@ def is_raid_level(cls, level): hasattr(level, 'get_size') -raid_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10", "linear"]) +raid_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10"]) EXTERNAL_DEPENDENCIES = [availability.BLOCKDEV_MDRAID_PLUGIN] From 3f7adcdd65a1e8e3e4400b88bff3bcb7ac1c0cb2 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 18 Sep 2024 15:30:05 +0200 Subject: [PATCH 2/2] 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 776859555..dcd994190 100644 --- a/blivet/nvme.py +++ b/blivet/nvme.py @@ -76,6 +76,10 @@ def available(self): 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):