[src/netbsd-9]: src/external/cddl/osnet/dist Pull up following revision(s) (r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31fa458d3964
branches:  netbsd-9
changeset: 1002276:31fa458d3964
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 19 16:46:20 2021 +0000

description:
Pull up following revision(s) (requested by nia in ticket #1274):

        external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c: revision 1.5
        external/cddl/osnet/dist/cmd/zfs/zfs_main.c: revision 1.8

zfs: this is not FreeBSD

diffstat:

 external/cddl/osnet/dist/cmd/zfs/zfs_main.c                 |  2 +-
 external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c |  4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r a13a21d25517 -r 31fa458d3964 external/cddl/osnet/dist/cmd/zfs/zfs_main.c
--- a/external/cddl/osnet/dist/cmd/zfs/zfs_main.c       Mon May 17 15:51:29 2021 +0000
+++ b/external/cddl/osnet/dist/cmd/zfs/zfs_main.c       Wed May 19 16:46:20 2021 +0000
@@ -6130,7 +6130,7 @@
                        break;
 
                case 'O':
-                       warnx("no overlay mounts support on FreeBSD, ignoring");
+                       warnx("no overlay mounts support on NetBSD, ignoring");
                        break;
                case ':':
                        (void) fprintf(stderr, gettext("missing argument for "
diff -r a13a21d25517 -r 31fa458d3964 external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
--- a/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c       Mon May 17 15:51:29 2021 +0000
+++ b/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c       Wed May 19 16:46:20 2021 +0000
@@ -1135,7 +1135,7 @@
                        m_label_free(new_sl);   /* OK if null */
 #else  /* !illumos */
                        zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-                           "mlslabel is not supported on FreeBSD"));
+                           "mlslabel is not supported on NetBSD"));
                        (void) zfs_error(hdl, EZFS_BADPROP, errbuf);
 #endif /* illumos */
                        goto error;
@@ -1644,7 +1644,7 @@
                case ZFS_PROP_NBMAND:
                case ZFS_PROP_MLSLABEL:
                        (void) snprintf(errbuf, sizeof (errbuf),
-                           "property '%s' not supported on FreeBSD",
+                           "property '%s' not supported on NetBSD",
                            nvpair_name(elem));
                        ret = zfs_error(hdl, EZFS_PERM, errbuf);
                        goto error;