From dc2ed04bad5936e8f9fe7e0d8383468ec7c66b50 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 18 Nov 2021 17:53:15 +0100
Subject: [PATCH] Fix packaging issue

Resolves: #2021703
---
 lvm2.spec       | 8 ++++++--
 tests/tests.yml | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lvm2.spec b/lvm2.spec
index 4f0adf1..57a0b28 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -53,7 +53,7 @@ Name: lvm2
 Epoch: %{rhel}
 %endif
 Version: 2.03.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://sourceware.org/lvm2
 Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
@@ -173,6 +173,7 @@ or more physical volumes and creating one or more logical volumes
 %if %{enable_integrity}
   --with-integrity=internal \
 %endif
+  --with-default-use-devices-file=1 \
   --disable-silent-rules \
   --enable-app-machineid \
   --enable-editline \
@@ -380,7 +381,7 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || :
 %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/blk-availability.service
 %{_unitdir}/lvm2-monitor.service
-#%{_unitdir}/lvm-vgchange@.service
+#%%{_unitdir}/lvm-vgchange@.service # vgchange is now part of udev rule
 %attr(555, -, -) %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator
 %if %{enable_lvmpolld}
 %{_unitdir}/lvm2-lvmpolld.socket
@@ -685,6 +686,9 @@ An extensive functional testsuite for LVM2.
 %endif
 
 %changelog
+* Thu Nov 18 2021 Marian Csontos <mcsontos@redhat.com> - 2.03.14-2
+- Change use_devices_file default back to 1.
+
 * Wed Oct 20 2021 Marian Csontos <mcsontos@redhat.com> - 2.03.14-1
 - Update to upstream version 2.03.14.
 - See WHATS_NEW and WHATS_NEW_DM for more information.
diff --git a/tests/tests.yml b/tests/tests.yml
index 357af21..7bb5235 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -30,13 +30,16 @@
       - shell/integrity # An unknown issue, likely in kernel
       - writecache-blocksize # A new test not working properly
       - system_id.sh
+      # issue with new kernel metadata format - need better way how to make thin meta corrupted:
+      - shell/lvconvert-repair-policy.sh
+      - shell/lvconvert-repair-thin.sh
     skip_tests:
       - read-ahead.sh # tuned is interfering with tests
 
       # VDO is not supported yet:
-      - vdo # no vdo in el9 yet
-      - lvconvert-cache-vdo.sh # TODO: likely an issue!
-      - lvcreate-vdo-cache.sh # TODO: likely an issue!
+      #- vdo # no vdo in el9 yet
+      #- lvconvert-cache-vdo.sh # TODO: likely an issue!
+      #- lvcreate-vdo-cache.sh # TODO: likely an issue!
       - lvconvert-cache-abort.sh # TODO: likely an issue!
 
       # TODO: Check and update list of known issues and unstable tests