From 7810d55dfcada3a656574a75587b2d152a369626 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 5 Apr 2006 22:24:16 +0000
Subject: pvremove without -f now fails if there's no PV label.

---
 tools/pvremove.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'tools/pvremove.c')

diff --git a/tools/pvremove.c b/tools/pvremove.c
index 1fce587a..75ea7f56 100644
--- a/tools/pvremove.c
+++ b/tools/pvremove.c
@@ -33,9 +33,14 @@ static int pvremove_check(struct cmd_context *cmd, const char *name)
 		return 0;
 	}
 
-	/* is there a pv here already */
-	if (!(pv = pv_read(cmd, name, NULL, NULL, 1)))
-		return 1;
+	/* Is there a pv here already? */
+	/* If not, this is an error unless you used -f. */
+	if (!(pv = pv_read(cmd, name, NULL, NULL, 1))) {
+		if (arg_count(cmd, force_ARG))
+			return 1;
+		else
+			return 0;
+	}
 
 	/* orphan ? */
 	if (!pv->vg_name[0])
-- 
cgit