Module Name: src
Committed By: martin
Date: Wed May 19 16:46:20 UTC 2021
Modified Files:
src/external/cddl/osnet/dist/cmd/zfs [netbsd-9]: zfs_main.c
src/external/cddl/osnet/dist/lib/libzfs/common [netbsd-9]:
libzfs_dataset.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 \
src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.6.4.1 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.6.4.2
--- src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.6.4.1 Fri Sep 27 09:18:37 2019
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c Wed May 19 16:46:20 2021
@@ -6130,7 +6130,7 @@ share_mount(int op, int argc, char **arg
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 "
Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4.4.1
--- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4 Mon May 28 21:05:06 2018
+++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c Wed May 19 16:46:20 2021
@@ -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, nvl
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;
