From owner-svn-src-projects@FreeBSD.ORG Sun Jan 30 12:04:22 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 378F61065693; Sun, 30 Jan 2011 12:04:22 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 283208FC08; Sun, 30 Jan 2011 12:04:22 +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 p0UC4MLi070820; Sun, 30 Jan 2011 12:04:22 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UC4MUp070818; Sun, 30 Jan 2011 12:04:22 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201101301204.p0UC4MUp070818@svn.freebsd.org> From: Alexander Motin Date: Sun, 30 Jan 2011 12:04:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218086 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 12:04:22 -0000 Author: mav Date: Sun Jan 30 12:04:21 2011 New Revision: 218086 URL: http://svn.freebsd.org/changeset/base/218086 Log: Make `graid label` report name of created geom. This name is required for any further array operations, especially for scripting. Modified: projects/graid/head/sys/geom/raid/g_raid_ctl.c Modified: projects/graid/head/sys/geom/raid/g_raid_ctl.c ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid_ctl.c Sun Jan 30 11:23:59 2011 (r218085) +++ projects/graid/head/sys/geom/raid/g_raid_ctl.c Sun Jan 30 12:04:21 2011 (r218086) @@ -72,6 +72,7 @@ g_raid_ctl_label(struct gctl_req *req, s const char *format; int *nargs; int crstatus, ctlstatus; + char buf[64]; nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); if (nargs == NULL) { @@ -101,6 +102,12 @@ g_raid_ctl_label(struct gctl_req *req, s gctl_error(req, "Command failed: %d.", ctlstatus); if (crstatus == G_RAID_MD_TASTE_NEW) g_raid_destroy_node(sc, 0); + } else { + if (crstatus == G_RAID_MD_TASTE_NEW) + snprintf(buf, sizeof(buf), "%s created\n", sc->sc_name); + else + snprintf(buf, sizeof(buf), "%s reused\n", sc->sc_name); + gctl_set_param_err(req, "output", buf, strlen(buf) + 1); } sx_xunlock(&sc->sc_lock); g_topology_lock();