Module Name: src
Committed By: riastradh
Date: Wed Feb 19 16:11:19 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: spa_history.c
src/external/cddl/osnet/sys/kern: misc.c
Log Message:
Report the OS name and release appropriately for NetBSD.
We are not OpenSolaris or uts!
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/kern/misc.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/uts/common/fs/zfs/spa_history.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.4 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c Wed Feb 19 16:11:19 2020
@@ -541,8 +541,8 @@ void
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);
}
Index: src/external/cddl/osnet/sys/kern/misc.c
diff -u src/external/cddl/osnet/sys/kern/misc.c:1.7 src/external/cddl/osnet/sys/kern/misc.c:1.8
--- src/external/cddl/osnet/sys/kern/misc.c:1.7 Tue Dec 31 14:51:29 2019
+++ src/external/cddl/osnet/sys/kern/misc.c Wed Feb 19 16:11:19 2020
@@ -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 @@ opensolaris_utsname_init(void *arg)
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));
}
