summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-05-19 16:46:20 +0000
committermartin <martin@NetBSD.org>2021-05-19 16:46:20 +0000
commit60c7871dec986110d8e2bb9f2069e212e90ff3ed (patch)
tree149a6f7f0c453edf52f4dd79840d8b45699405dd /external
parentc2cb1fb649897eb590b2e567273c4f6a0a1317f7 (diff)
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 (limited to 'external')
-rw-r--r--external/cddl/osnet/dist/cmd/zfs/zfs_main.c2
-rw-r--r--external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/external/cddl/osnet/dist/cmd/zfs/zfs_main.c b/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
index 19a2d675a62..eedbc783365 100644
--- a/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
+++ b/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
@@ -6130,7 +6130,7 @@ share_mount(int op, int argc, char **argv)
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 --git a/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c b/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
index febdbb45de5..062ab599023 100644
--- a/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
+++ b/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
@@ -1135,7 +1135,7 @@ badlabel:
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 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
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;