[src/trunk]: src/external/cddl/osnet Report the OS name and release appropria...

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

details:   https://anonhg.NetBSD.org/src/rev/c3b59a4bb38e
branches:  trunk
changeset: 849031:c3b59a4bb38e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Feb 19 16:11:19 2020 +0000

description:
Report the OS name and release appropriately for NetBSD.

We are not OpenSolaris or uts!

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c |  4 ++--
 external/cddl/osnet/sys/kern/misc.c                      |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 7af4461018ed -r c3b59a4bb38e external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c  Wed Feb 19 16:07:37 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c  Wed Feb 19 16:11:19 2020 +0000
@@ -541,8 +541,8 @@
 spa_history_log_version(spa_t *spa, const char *operation)
 {
        spa_history_log_internal(spa, operation, NULL,
-           "pool version %llu; software version %llu/%d; uts %s %s %s %s",
+           "pool version %llu; software version %llu/%d; %s %s %s %s %s",
            (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
-           utsname.nodename, utsname.release, utsname.version,
+           utsname.sysname, utsname.nodename, utsname.release, utsname.version,
            utsname.machine);
 }
diff -r 7af4461018ed -r c3b59a4bb38e external/cddl/osnet/sys/kern/misc.c
--- a/external/cddl/osnet/sys/kern/misc.c       Wed Feb 19 16:07:37 2020 +0000
+++ b/external/cddl/osnet/sys/kern/misc.c       Wed Feb 19 16:11:19 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: misc.c,v 1.7 2019/12/31 14:51:29 pgoyette Exp $        */
+/*     $NetBSD: misc.c,v 1.8 2020/02/19 16:11:19 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
        strlcpy(utsname.sysname, ostype, sizeof(utsname.sysname));
        strlcpy(utsname.nodename, hostname, sizeof(utsname.nodename));
        strlcpy(utsname.release, osrelease, sizeof(utsname.release));
-       strlcpy(utsname.version, "OpenSolaris", sizeof(utsname.version));
+       strlcpy(utsname.version, version, sizeof(utsname.version));
        strlcpy(utsname.machine, machine, sizeof(utsname.machine));
 }