From owner-svn-src-head@FreeBSD.ORG  Wed Dec  8 08:57:37 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1A2D106566B;
	Wed,  8 Dec 2010 08:57:37 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99F928FC08;
	Wed,  8 Dec 2010 08:57:37 +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 oB88vbv5096252;
	Wed, 8 Dec 2010 08:57:37 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB88vbH6096250;
	Wed, 8 Dec 2010 08:57:37 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201012080857.oB88vbH6096250@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 8 Dec 2010 08:57:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216291 -
	head/cddl/contrib/opensolaris/lib/libzfs/common
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Dec 2010 08:57:38 -0000

Author: mm
Date: Wed Dec  8 08:57:37 2010
New Revision: 216291
URL: http://svn.freebsd.org/changeset/base/216291

Log:
  Do not print OpenSolaris hint to use (non-existing) installgrub(1) command
  if creating a mirror by attaching a new vdev to a root pool.
  
  Reported by:	James R. Van Artsdalen (on freebsd-fs@freebsd.org)
  Approved by:	delphij (mentor)
  MFC after:	3 days

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Wed Dec  8 08:01:27 2010	(r216290)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Wed Dec  8 08:57:37 2010	(r216291)
@@ -48,11 +48,13 @@
 
 static int read_efi_label(nvlist_t *config, diskaddr_t *sb);
 
+#ifdef sun
 #if defined(__i386) || defined(__amd64)
 #define	BOOTCMD	"installgrub(1M)"
 #else
 #define	BOOTCMD	"installboot(1M)"
 #endif
+#endif	/* sun */
 
 /*
  * ====================================================================
@@ -1888,6 +1890,7 @@ zpool_vdev_attach(zpool_handle_t *zhp,
 	zcmd_free_nvlists(&zc);
 
 	if (ret == 0) {
+#ifdef sun
 		if (rootpool) {
 			/*
 			 * XXX - This should be removed once we can
@@ -1898,6 +1901,7 @@ zpool_vdev_attach(zpool_handle_t *zhp,
 			    "be sure to invoke %s to make '%s' bootable.\n"),
 			    BOOTCMD, new_disk);
 		}
+#endif	/* sun */
 		return (0);
 	}