pool/lvm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 712184 from home:hmzhao:branches:openSUSE:Factory

Browse Source 
restore lvm.conf

OBS-URL: https://build.opensuse.org/request/show/712184
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=242
This commit is contained in:
Gang He 2019-06-27 05:21:48 +00:00 committed by Git OBS Bridge
parent 64964ed048
commit d1d2497104
8 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch Normal file
View File

@ -0,0 +1,35 @@
From b13ebfa4c289a5bc6eb4f8ba26126db8e6d78296 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Wed, 26 Jun 2019 16:03:42 -0500
Subject: [PATCH] pvremove/vgextend: fix using device aliases with lvmetad
These commands were looking for the requested device alias
before dev_cache_scan had created the list of devs on the
system, so they would fail and report the dev wasn't found.
---
tools/toollib.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tools/toollib.c b/tools/toollib.c
index 3221e5f1ca..1b01cccfa2 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -5543,6 +5543,15 @@ int pvcreate_each_device(struct cmd_context *cmd,
lvmcache_label_scan(cmd);
+ /*
+ * When using lvmetad, we want to do a dev cache scan here (if not done
+ * already) so that the dev_cache_get just below will be able to find
+ * device aliases. When not using lvmetad, the label_scan just above
+ * has done dev_cache_scan, and this will not be run.
+ */
+ if (!dev_cache_has_scanned())
+ dev_cache_scan();
+
/*
* Translate arg names into struct device's.
*/
--
2.21.0

5
device-mapper.changes
View File

@ -1,7 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 6 07:55:00 UTC 2019 - heming.zhao@suse.com Thu Jun 27 02:53:03 UTC 2019 - heming.zhao@suse.com
- Remove conflict filter in /etc/lvm/lvm.conf (bsc#1137296) - Fix using device aliases with lvmetad (bsc#1137296)
+ bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com

2
device-mapper.spec
View File

@ -52,6 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Upstream patches # Upstream patches
Patch0001: bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch Patch0001: bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch
Patch0002: bug-1122666_devices-drop-open-error-message.patch Patch0002: bug-1122666_devices-drop-open-error-message.patch
Patch0003: bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
# SUSE patches: 1000+ for LVM # SUSE patches: 1000+ for LVM
# Never upstream # Never upstream
@ -74,6 +75,7 @@ Programs and man pages for configuring and using the device mapper.
### COMMON-PREP-BEGIN ### ### COMMON-PREP-BEGIN ###
%patch0001 -p1 %patch0001 -p1
%patch0002 -p1 %patch0002 -p1
%patch0003 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1 %patch1002 -p1
%patch1003 -p1 %patch1003 -p1

2
lvm.conf
View File

@ -140,7 +140,7 @@ devices {
# #
# This configuration option has an automatic default value. # This configuration option has an automatic default value.
# filter = [ "a|.*/|" ] # filter = [ "a|.*/|" ]
filter = [ "r|/dev/.*/by-path/.*|", "r|/dev/.*/by-id/.*|", "r|/dev/fd.*|", "r|/dev/cdrom|" ] filter = [ "r|/dev/.*/by-path/.*|", "r|/dev/.*/by-id/.*|", "r|/dev/fd.*|", "r|/dev/cdrom|", "a/.*/" ]
# Configuration option devices/global_filter. # Configuration option devices/global_filter.
# Limit the block devices that are used by LVM system components. # Limit the block devices that are used by LVM system components.

5
lvm2-clvm.changes
View File

@ -1,7 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 6 07:55:00 UTC 2019 - heming.zhao@suse.com Thu Jun 27 02:53:03 UTC 2019 - heming.zhao@suse.com
- Remove conflict filter in /etc/lvm/lvm.conf (bsc#1137296) - Fix using device aliases with lvmetad (bsc#1137296)
+ bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com

2
lvm2-clvm.spec
View File

@ -60,6 +60,7 @@ Provides: cmirrord = %{version}
# Upstream patches # Upstream patches
Patch0001: bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch Patch0001: bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch
Patch0002: bug-1122666_devices-drop-open-error-message.patch Patch0002: bug-1122666_devices-drop-open-error-message.patch
Patch0003: bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
# SUSE patches: 1000+ for LVM # SUSE patches: 1000+ for LVM
# Never upstream # Never upstream
@ -86,6 +87,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
### COMMON-PREP-BEGIN ### ### COMMON-PREP-BEGIN ###
%patch0001 -p1 %patch0001 -p1
%patch0002 -p1 %patch0002 -p1
%patch0003 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1 %patch1002 -p1
%patch1003 -p1 %patch1003 -p1

5
lvm2.changes
View File

@ -1,7 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 6 07:55:00 UTC 2019 - heming.zhao@suse.com Thu Jun 27 02:53:03 UTC 2019 - heming.zhao@suse.com
- Remove conflict filter in /etc/lvm/lvm.conf (bsc#1137296) - Fix using device aliases with lvmetad (bsc#1137296)
+ bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com

2
lvm2.spec
View File

@ -62,6 +62,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Upstream patches # Upstream patches
Patch0001: bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch Patch0001: bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch
Patch0002: bug-1122666_devices-drop-open-error-message.patch Patch0002: bug-1122666_devices-drop-open-error-message.patch
Patch0003: bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
# SUSE patches: 1000+ for LVM # SUSE patches: 1000+ for LVM
# Never upstream # Never upstream
@ -94,6 +95,7 @@ Volume Manager.
### COMMON-PREP-BEGIN ### ### COMMON-PREP-BEGIN ###
%patch0001 -p1 %patch0001 -p1
%patch0002 -p1 %patch0002 -p1
%patch0003 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1 %patch1002 -p1
%patch1003 -p1 %patch1003 -p1