revert Prefer UUID for fstab spec for DM devices too

This commit is contained in:
sun_hai_10 2024-06-29 17:11:31 +08:00
parent a6f32d6a40
commit 7094913d15
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From d14af518e0031336861c8fdaeb3c4534e7c2fd6f Mon Sep 17 00:00:00 2001
From: s30028044 <sunhai10@huawei.com>
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

View File

@ -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<sunhai10@huawei.com> - 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 <yueyuankun@kylinos.cn> - 1:3.8.2-6
- Type:bugfix
- ID:NA