!29 lvreduce support --yes option

From: @wguanghao
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2021-07-28 06:03:57 +00:00 committed by Gitee
commit 8b98570ef7
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 287565fd5dd5f49f1a51c6cd9ebdc9c20ebc7730 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Tue, 6 Apr 2021 12:26:42 +0200
Subject: [PATCH] lvreduce: support --yes
Missed support for --yes with 'lvreduce' to answer 'y' to prompt.
---
lib/metadata/lv_manip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 81346bd..b38acf8 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -4970,7 +4970,7 @@ static int _request_confirmation(const struct logical_volume *lv,
log_warn("THIS MAY DESTROY YOUR DATA (filesystem etc.)");
- if (!lp->force) {
+ if (!lp->force && !lp->yes) {
if (yes_no_prompt("Do you really want to reduce %s? [y/n]: ",
display_lvname(lv)) == 'n') {
log_error("Logical volume %s NOT reduced.",
--
1.8.3.1

View File

@ -43,7 +43,7 @@
Name: lvm2 Name: lvm2
Version: 2.03.11 Version: 2.03.11
Release: 3 Release: 4
Epoch: 8 Epoch: 8
Summary: Tools for logical volume management Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD License: GPLv2+ and LGPLv2.1 and BSD
@ -61,6 +61,7 @@ Patch9: 0009-enhancement-add-dfx-log.patch
Patch10: 0010-enhancement-syslog-more-when-use-libdevmapper-so.patch Patch10: 0010-enhancement-syslog-more-when-use-libdevmapper-so.patch
Patch11: 0011-enhancement-log-it-when-disk-slow.patch Patch11: 0011-enhancement-log-it-when-disk-slow.patch
Patch12: 0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch Patch12: 0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch
Patch13: 0013-lvreduce-support-yes.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -485,6 +486,9 @@ fi
%changelog %changelog
* Wed Jul 28 2021 wuguanghao<wuguanghao3@huawei.com> - 8.2.03.11-4
- lvreduce support --yes option
* Mon Jul 26 2021 wuguanghao<wuguanghao3@huawei.com> - 8.2.03.11-3 * Mon Jul 26 2021 wuguanghao<wuguanghao3@huawei.com> - 8.2.03.11-3
- revert commit of fix VERSION issue when packaging - revert commit of fix VERSION issue when packaging