From a2f944a140dc4db1f515d748320bdca01b4dc295 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 27 Aug 2020 00:43:06 -0400 Subject: [PATCH] zpool: Change base URL for ZFS messages to openzfs-docs Reviewed-by: George Melikov Reviewed-by: Kjeld Schouten Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10820 --- cmd/zpool/zpool_main.c | 9 ++++++--- include/sys/fs/zfs.h | 8 ++++---- lib/libzfs/libzfs_sendrecv.c | 3 ++- module/zfs/spa.c | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index f3756a5d9..adbb78a8e 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -2816,7 +2816,8 @@ show_import(nvlist_t *config) if (msgid != NULL) { (void) printf(gettext( - " see: https://zfsonlinux.org/msg/%s\n"), msgid); + " see: https://openzfs.github.io/openzfs-docs/msg/%s\n"), + msgid); } (void) printf(gettext(" config:\n\n")); @@ -7804,7 +7805,7 @@ print_dedup_stats(nvlist_t *config) * pool: tank * status: DEGRADED * reason: One or more devices ... - * see: https://zfsonlinux.org/msg/ZFS-xxxx-01 + * see: https://openzfs.github.io/openzfs-docs/msg/ZFS-xxxx-01 * config: * mirror DEGRADED * c1t0d0 OK @@ -8193,7 +8194,9 @@ status_callback(zpool_handle_t *zhp, void *data) if (msgid != NULL) { printf(" "); printf_color(ANSI_BOLD, gettext("see:")); - printf(gettext(" https://zfsonlinux.org/msg/%s\n"), msgid); + printf(gettext( + " https://openzfs.github.io/openzfs-docs/msg/%s\n"), + msgid); } if (config != NULL) { diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index d3acd674a..f6f633a95 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -1013,10 +1013,10 @@ typedef struct vdev_rebuild_stat { } vdev_rebuild_stat_t; /* - * Errata described by https://zfsonlinux.org/msg/ZFS-8000-ER. The ordering - * of this enum must be maintained to ensure the errata identifiers map to - * the correct documentation. New errata may only be appended to the list - * and must contain corresponding documentation at the above link. + * Errata described by https://openzfs.github.io/openzfs-docs/msg/ZFS-8000-ER. + * The ordering of this enum must be maintained to ensure the errata identifiers + * map to the correct documentation. New errata may only be appended to the + * list and must contain corresponding documentation at the above link. */ typedef enum zpool_errata { ZPOOL_ERRATA_NONE, diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index e5af6453b..b17b105ca 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -4850,7 +4850,8 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, case ZFS_ERR_FROM_IVSET_GUID_MISSING: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "IV set guid missing. See errata %u at " - "https://zfsonlinux.org/msg/ZFS-8000-ER."), + "https://openzfs.github.io/openzfs-docs/msg/" + "ZFS-8000-ER."), ZPOOL_ERRATA_ZOL_8308_ENCRYPTION); (void) zfs_error(hdl, EZFS_BADSTREAM, errbuf); break; diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 1e3728d93..75ff398d1 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -3201,7 +3201,8 @@ spa_verify_host(spa_t *spa, nvlist_t *mos_config) cmn_err(CE_WARN, "pool '%s' could not be " "loaded as it was last accessed by " "another system (host: %s hostid: 0x%llx). " - "See: http://illumos.org/msg/ZFS-8000-EY", + "See: https://openzfs.github.io/openzfs-docs/msg/" + "ZFS-8000-EY", spa_name(spa), hostname, (u_longlong_t)hostid); spa_load_failed(spa, "hostid verification failed: pool " "last accessed by host: %s (hostid: 0x%llx)",