diff options
| author | mm <mm@FreeBSD.org> | 2010-12-08 08:57:37 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-12-08 08:57:37 +0000 |
| commit | 9bce36c38edb4c76d8a66373ae3ff0d0cc8bd32a (patch) | |
| tree | 99b5446eee95b1cabd2b03ee88b4ec94cc0e4a87 /cddl | |
| parent | ac1ae957345ae3dcbc1a254c812bc7167503fff4 (diff) | |
| download | FreeBSD-src-9bce36c38edb4c76d8a66373ae3ff0d0cc8bd32a.zip FreeBSD-src-9bce36c38edb4c76d8a66373ae3ff0d0cc8bd32a.tar.gz | |
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
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c index d734f2c..fc64b0b 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c @@ -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); } |
