d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not print OpenSolaris hint to use (non-existing) installgrub(1) command

Browse Source 
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
This commit is contained in:
Martin Matuska 2010-12-08 08:57:37 +00:00
parent 46f6a6edba
commit 60a7e0c3cb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
View File

@ -48,11 +48,13 @@
static int read_efi_label(nvlist_t *config, diskaddr_t *sb); static int read_efi_label(nvlist_t *config, diskaddr_t *sb);
#ifdef sun
#if defined(__i386) || defined(__amd64) #if defined(__i386) || defined(__amd64)
#define BOOTCMD "installgrub(1M)" #define BOOTCMD "installgrub(1M)"
#else #else
#define BOOTCMD "installboot(1M)" #define BOOTCMD "installboot(1M)"
#endif #endif
#endif /* sun */
/* /*
* ==================================================================== * ====================================================================
@ -1888,6 +1890,7 @@ zpool_vdev_attach(zpool_handle_t *zhp,
zcmd_free_nvlists(&zc); zcmd_free_nvlists(&zc);
if (ret == 0) { if (ret == 0) {
#ifdef sun
if (rootpool) { if (rootpool) {
/* /*
* XXX - This should be removed once we can * 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"), "be sure to invoke %s to make '%s' bootable.\n"),
BOOTCMD, new_disk); BOOTCMD, new_disk);
} }
#endif /* sun */
return (0); return (0);
} }