From ea0431bfbfe9493836f010d9b358eb6df22e6b07 Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Sat, 29 Jun 2024 17:11:31 +0800 Subject: [PATCH] revert Prefer UUID for fstab spec for DM devices too (cherry picked from commit 7094913d1527a14d22de55b2198c6b73f6e14035) --- ...ID-for-fstab-spec-for-DM-devices-too.patch | 31 +++++++++++++++++++ python-blivet.spec | 9 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch diff --git a/bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch b/bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch new file mode 100644 index 0000000..7f1b286 --- /dev/null +++ b/bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch @@ -0,0 +1,31 @@ +From d14af518e0031336861c8fdaeb3c4534e7c2fd6f Mon Sep 17 00:00:00 2001 +From: s30028044 +Date: Sat, 29 Jun 2024 16:53:26 +0800 +Subject: [PATCH] revert Prefer UUID for fstab spec for DM devices too + +revert the patch of "Prefer UUID for fstab spec for DM devices too" +Reference: https://github.com/storaged-project/blivet/commit/7aa07083dbc90b0fabea063ca5a19ee3d154b1b2 +Conflict: https://github.com/storaged-project/blivet/commit/7aa07083dbc90b0fabea063ca5a19ee3d154b1b2 +--- + blivet/devices/dm.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py +index 4362f82..0ac5f01 100644 +--- a/blivet/devices/dm.py ++++ b/blivet/devices/dm.py +@@ -97,6 +97,11 @@ class DMDevice(StorageDevice): + d.update({"target": self.target, "dm_uuid": self.dm_uuid}) + return d + ++ @property ++ def fstab_spec(self): ++ """ Return the device specifier for use in /etc/fstab. """ ++ return self.path ++ + @property + def map_name(self): + """ This device's device-mapper map name """ +-- +2.27.0 + diff --git a/python-blivet.spec b/python-blivet.spec index dbcb560..5324be6 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -3,7 +3,7 @@ Name: python-blivet Version: 3.8.2 -Release: 6 +Release: 7 Epoch: 1 Summary: A python module for system storage configuration License: LGPL-2.1-or-later @@ -26,6 +26,7 @@ patch9002: Incomplete-Chineseization-of-disk-mount.patch patch6001: backport-Ignore-invalid-empty-UUIDs-for-NVMe-namespaces.patch patch9003: bugfix-fix-empty-UUIDs-for-NVMe-namespaces.patch +patch9004: bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch %description The python-blivet package is a python module for examining and modifying @@ -128,6 +129,12 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install %doc README.md %changelog +* Sat Jun 29 2024 sunhai - 1:3.8.2-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:revert Prefer UUID for fstab spec for DM devices too + * Mon Jun 17 2024 yueyuankun - 1:3.8.2-6 - Type:bugfix - ID:NA -- Gitee