Author: mm
Date: Sat Dec 11 23:48:10 2010
New Revision: 216386
URL: http://svn.freebsd.org/changeset/base/216386
Log:
MFC r216291, r216293:
MFC r216291:
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.
MFC r216293:
Print message with information about updating the boot code if a new
vdev is attached to a root pool (e.g. when creating a mirrored boot pool).
Reported by: James R. Van Artsdalen (on freebsd...@freebsd.org)
Reviewed by: pjd
Approved by: re (kib), delphij (mentor)
Modified:
stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
Directory Properties:
stable/8/cddl/contrib/opensolaris/ (props changed)
Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Dec
11 22:33:33 2010 (r216385)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Dec
11 23:48:10 2010 (r216386)
@@ -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 */
/*
* ====================================================================
@@ -1889,14 +1891,15 @@ zpool_vdev_attach(zpool_handle_t *zhp,
if (ret == 0) {
if (rootpool) {
- /*
- * XXX - This should be removed once we can
- * automatically install the bootblocks on the
- * newly attached disk.
- */
- (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Please "
- "be sure to invoke %s to make '%s' bootable.\n"),
- BOOTCMD, new_disk);
+ (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
+ "you boot from pool '%s', you may need to update\n"
+ "boot code on newly attached disk '%s'.\n\n"
+ "Assuming you use GPT partitioning and 'da0' is "
+ "your new boot disk\n"
+ "you may use the following command:\n\n"
+ "\tgpart bootcode -b /boot/pmbr -p "
+ "/boot/gptzfsboot -i 1 da0\n\n"),
+ zhp->zpool_name, new_disk);
}
return (0);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
