From owner-svn-src-all@FreeBSD.ORG  Sat Nov 27 13:38:17 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0776106564A;
	Sat, 27 Nov 2010 13:38:17 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AE60E8FC08;
	Sat, 27 Nov 2010 13:38:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oARDcHUs060981;
	Sat, 27 Nov 2010 13:38:17 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oARDcHLA060979;
	Sat, 27 Nov 2010 13:38:17 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201011271338.oARDcHLA060979@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sat, 27 Nov 2010 13:38:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215940 - stable/8/sbin/geom/class/part
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Nov 2010 13:38:17 -0000

Author: ae
Date: Sat Nov 27 13:38:17 2010
New Revision: 215940
URL: http://svn.freebsd.org/changeset/base/215940

Log:
  r214975 was not fully adapted to stable/8 and in-kernel version of
  "destroy -F" does not work, because g_part_parm_uint assumes that
  parameter is an asci string, but in head/ it is not.
  
  Add gpart_destroy wrapper function to gpart(8). It changes "force"
  parameter and does convert it to string.
  
  This is direct commit to stable/8.

Modified:
  stable/8/sbin/geom/class/part/geom_part.c

Modified: stable/8/sbin/geom/class/part/geom_part.c
==============================================================================
--- stable/8/sbin/geom/class/part/geom_part.c	Sat Nov 27 13:35:19 2010	(r215939)
+++ stable/8/sbin/geom/class/part/geom_part.c	Sat Nov 27 13:38:17 2010	(r215940)
@@ -85,6 +85,7 @@ static int gpart_show_hasopt(struct gctl
 static void gpart_write_partcode(struct ggeom *, int, void *, ssize_t);
 static void gpart_write_partcode_vtoc8(struct ggeom *, int, void *);
 static void gpart_print_error(const char *);
+static void gpart_destroy(struct gctl_req *, unsigned int);
 
 struct g_command PUBSYM(class_commands)[] = {
 	{ "add", 0, gpart_issue, {
@@ -119,7 +120,7 @@ struct g_command PUBSYM(class_commands)[
 		G_OPT_SENTINEL },
 	  "geom", NULL
 	},
-	{ "destroy", 0, gpart_issue, {
+	{ "destroy", 0, gpart_destroy, {
 		{ 'F', "force", NULL, G_TYPE_BOOL },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
@@ -864,6 +865,17 @@ gpart_bootcode(struct gctl_req *req, uns
 }
 
 static void
+gpart_destroy(struct gctl_req *req, unsigned int fl)
+{
+
+	if (gctl_get_int(req, "force"))
+		gctl_change_param(req, "force", -1, "1");
+	else
+		gctl_change_param(req, "force", -1, "0");
+	gpart_issue(req, fl);
+}
+
+static void
 gpart_print_error(const char *errstr)
 {
 	char *errmsg;