Update RHEL patch for 3.9.0

This commit is contained in:
Vojtech Trefny 2024-01-31 13:30:41 +01:00
parent c82e474e41
commit 6fb394db93

View File

@ -11,18 +11,18 @@ diff --git a/blivet/__init__.py b/blivet/__init__.py
index 14bd5c61..1410d78e 100644 index 14bd5c61..1410d78e 100644
--- a/blivet/__init__.py --- a/blivet/__init__.py
+++ b/blivet/__init__.py +++ b/blivet/__init__.py
@@ -63,9 +63,9 @@ gi.require_version("BlockDev", "2.0") @@ -63,9 +63,9 @@ gi.require_version("BlockDev", "3.0")
from gi.repository import GLib from gi.repository import GLib
from gi.repository import BlockDev as blockdev from gi.repository import BlockDev as blockdev
if arch.is_s390(): if arch.is_s390():
- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm", "nvme")) - _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvme", "fs"))
+ _REQUESTED_PLUGIN_NAMES = set(("lvm", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm", "nvme")) + _REQUESTED_PLUGIN_NAMES = set(("lvm", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvme", "fs"))
else: else:
- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm", "nvme")) - _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvme", "fs"))
+ _REQUESTED_PLUGIN_NAMES = set(("lvm", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm", "nvme")) + _REQUESTED_PLUGIN_NAMES = set(("lvm", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvme", "fs"))
_requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES) _requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES)
try: try:
-- --
2.26.2 2.26.2