[illumos-gate merge]

commit 2385a4422808a5effb54aad5f1e17f0fd1ed7f84
    10110 get_tz_countries shouldn't check array for NULL
commit 933ae53f0bf0708d7bf2756d3f21936a0d5fad82
    10141 smatch fix for zoneadmd
commit a0b03b161c4df3cfc54fbc741db09b3bdc23ffba
    10330 merge recent ZoL vdev and metaslab changes
commit bc1f688b4872ace323eaddbb1a6365d054e7bf56
    6885 CTF Everywhere Part 1
    6886 Want ctfdiff
    6887 ctfdump should be written in terms of libctf
    6888 ctfmerge should be implemented in terms of libctf
    6889 ctfconvert should be implemented in terms of libctf
    6890 Want general workq
    6891 Want general mergeq
    6892 ctf_add_encoded assigns() incorrect byte size to types
    6893 ctf_add_{struct,union,enum} can reuse forwards
    6894 ctf_add_{struct,union,enum} occasionally forget to dirty the ctf_file_t
    6895 ctf_add_member could better handle bitfields
    6896 ctf_type_size() reports wrong size for forwards
    6897 Want libctf ctf_kind_name() function
    6898 Want libctf function to set struct/union size
commit 2b987d42b0ad07d74e39b18a2498709e5195d7e3
    9696 add /etc/system.d support
commit 7d732bb0c50cbe80dedb2fdedd5ecfa51b90c302
    10138 smatch fixes for usr/src/cmd/sgs

	Conflicts:
	usr/src/tools/ctf/Makefile.ctf
	usr/src/test/util-tests/tests/Makefile
	usr/src/test/util-tests/runfiles/default.run
	usr/src/pkg/manifests/system-test-utiltest.mf
	usr/src/lib/libctf/common/mapfile-vers
	usr/src/lib/libctf/common/libctf.h
	usr/src/lib/libctf/common/ctf_lib.c
	usr/src/lib/libctf/common/ctf_convert.c
	usr/src/common/ctf/ctf_types.c
	usr/src/uts/common/fs/zfs/sys/metaslab.h
	usr/src/uts/common/fs/zfs/vdev_initialize.c
	usr/src/uts/common/fs/zfs/metaslab.c

1 files changed, 23 insertions, 5 deletions

diff --git a/usr/src/man/man4/system.4 b/usr/src/man/man4/system.4
index ebd0d96faa..1b42fc3a75 100644
--- a/usr/src/man/man4/system.4
+++ b/usr/src/man/man4/system.4
@@ -1,11 +1,12 @@
 '\" te
 .\" Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
 .\" Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
+.\" Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 .\" Copyright 1989 AT&T
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SYSTEM 4 "Jan 25, 2016"
+.TH SYSTEM 4 "Jan 29, 2019"
 .SH NAME
 system \- system configuration information file
 .SH DESCRIPTION
@@ -15,6 +16,23 @@ system kernel. The recommended procedure is to preserve the original
 \fBsystem\fR file before modifying it.
 .sp
 .LP
+It is not recommended to edit the \fB/etc/system\fR file directly but rather
+to deliver configuration fragments into files under \fB/etc/system.d\fR;
+files in this directory are combined in alphabetical order and read by the
+kernel before \fB/etc/system\fR is processed. Directives in \fB/etc/system\fR
+therefore take precedence over any settings delivered in fragment files.
+.sp
+.LP
+The recommended naming schema for the fragment files is to use the name of
+the package which is delivering the file with '\fB/\fR' characters replaced
+by '\fB:\fR'; file names that start with a dot (\fB.\fR) will be ignored.
+.sp
+.LP
+If \fB/etc/system.d/\fR exists and contains any fragment files,
+then the directory must also be writable or it will not be possible to
+create or update the system boot archive.
+.sp
+.LP
 The \fBsystem\fR file contains commands which are read by the kernel during
 initialization and used to customize the operation of your system. These
 commands are useful for modifying the system's treatment of its loadable kernel
@@ -286,9 +304,9 @@ escape sequences are supported within the quoted string:
 .sp
 .in +2
 .nf
-\en 	(newline)
-\et 	(tab)
-\eb 	(backspace)
+\en	(newline)
+\et	(tab)
+\eb	(backspace)
 .fi
 .in -2
 .sp
@@ -360,4 +378,4 @@ file that will work, you may specify \fB/dev/null\fR. This acts as an empty
 settings.
 .SH NOTES
 .LP
-The \fB/etc/system\fR file is read only once, at boot time.
+The \fBsystem\fR files are read only once, at boot time.