svn commit: r216291 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Martin Matuska]

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 at 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);
 	}