From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3306-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 27397 invoked by alias); 7 Jul 2010 21:30:09 -0000
Received: (qmail 27383 invoked by uid 9657); 7 Jul 2010 21:30:09 -0000
Date: Wed, 07 Jul 2010 21:30:00 -0000
Message-ID: <20100707213009.27381.qmail@sourceware.org>
From: wysochanski@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools pvchange.c vgextend.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-07/txt/msg00028.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2010-07-07 21:30:08

Modified files:
	tools          : pvchange.c vgextend.c 

Log message:
	Shorten prompt for pvchange and vgextend.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/pvchange.c.diff?cvsroot=lvm2&r1=1.81&r2=1.82
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgextend.c.diff?cvsroot=lvm2&r1=1.58&r2=1.59

--- LVM2/tools/pvchange.c	2010/07/07 19:14:58	1.81
+++ LVM2/tools/pvchange.c	2010/07/07 21:30:07	1.82
@@ -124,10 +124,9 @@
 	} else if (arg_count(cmd, metadataignore_ARG)) {
 		if ((vg_mda_copies(vg) != VGMETADATACOPIES_UNMANAGED) &&
 		    (arg_count(cmd, force_ARG) == PROMPT) &&
-		    yes_no_prompt("Setting metadataignore on %s will override "
-				  "preferred number of copies of VG %s "
-				  "metadata.\nAre you sure? [y/n]: ",
-				  pv_name, pv_vg_name(pv)) == 'n') {
+		    yes_no_prompt("Override preferred number of copies "
+				  "of VG %s metadata? [y/n]: ",
+				  pv_vg_name(pv)) == 'n') {
 			log_error("Physical volume %s not changed", pv_name);
 			goto out;
 		}
--- LVM2/tools/vgextend.c	2010/07/07 19:14:58	1.58
+++ LVM2/tools/vgextend.c	2010/07/07 21:30:07	1.59
@@ -62,9 +62,8 @@
 	if (arg_count(cmd, metadataignore_ARG) &&
 	    (vg_mda_copies(vg) != VGMETADATACOPIES_UNMANAGED) &&
 	    (pp.force == PROMPT) &&
-	    yes_no_prompt("Setting metadataignore will override "
-			  "preferred number of copies of VG %s "
-			  "metadata.\nAre you sure? [y/n]: ",
+	    yes_no_prompt("Override preferred number of copies "
+			  "of VG %s metadata? [y/n]: ",
 			  vg_name) == 'n') {
 		log_error("Volume group %s not changed", vg_name);
 		goto_bad;