Additional patch for 8.9.0 lvm2.

Resolves: #2173312
This commit is contained in:
Marian Csontos 2023-07-27 15:18:24 +02:00
parent 9ac44fb8d2
commit 42871359a8
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From adaa7034883c7f237fa35a80e93563ea56ea9362 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 17 Jul 2023 16:22:29 +0200
Subject: [PATCH 1/2] vdo: use long --verbose
vdo tools needs long option.
(cherry picked from commit 1c2782354c9ad49f1e2c9af58d7f5085f0632cb5)
---
scripts/lvm_import_vdo.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lvm_import_vdo.sh b/scripts/lvm_import_vdo.sh
index b5e1a9e16..f0e93075a 100755
--- a/scripts/lvm_import_vdo.sh
+++ b/scripts/lvm_import_vdo.sh
@@ -619,7 +619,7 @@ do
"-f"|"--force" ) FORCE="-f" ;;
"-h"|"--help" ) tool_usage ;;
"-n"|"--name" ) shift; NAME=$1 ;;
- "-v"|"--verbose") VERB="-v" ;;
+ "-v"|"--verbose") VERB="--verbose" ;;
"-y"|"--yes" ) YES="-y" ;;
"--abort-after-vdo-convert" ) ABORT_AFTER_VDO_CONVERT=1; USE_VDO_DM_SNAPSHOT=0 ;; # For testing only
"--dry-run" ) DRY="1" ; VERB="-v" ;;
--
2.41.0

View File

@ -68,7 +68,7 @@ Version: 2.03.14
%if 0%{?from_snapshot}
Release: 0.1.20210426git%{shortcommit}%{?dist}%{?rel_suffix}
%else
Release: 10%{?dist}%{?rel_suffix}
Release: 11%{?dist}%{?rel_suffix}
%endif
License: GPLv2
URL: http://sourceware.org/lvm2
@ -203,6 +203,7 @@ Patch113: 0112-vdo-indent-for-lvdisplay.patch
Patch114: 0113-vdo-lvm_import_vdo-correct-parsing-output.patch
Patch115: 0114-lvm_import_vdo-spelling-fixes.patch
Patch116: 0115-vdo-support-version-4.patch
Patch117: 0116-vdo-use-long-verbose.patch
BuildRequires: gcc
%if %{enable_testsuite}
@ -880,6 +881,9 @@ An extensive functional testsuite for LVM2.
%endif
%changelog
* Thu Jul 27 2023 Marian Csontos <mcsontos@redhat.com> - 2.03.14-11
- Fix verbose option in lvm_import_vdo.sh.
* Thu Jul 13 2023 Marian Csontos <mcsontos@redhat.com> - 2.03.14-10
- Improve VDO support.