diff options
Diffstat (limited to 'usr/src/man/man1')
| -rw-r--r-- | usr/src/man/man1/Makefile | 14 | ||||
| -rw-r--r-- | usr/src/man/man1/column.1 | 129 | ||||
| -rw-r--r-- | usr/src/man/man1/crontab.1 | 49 | ||||
| -rw-r--r-- | usr/src/man/man1/diff.1 | 1 | ||||
| -rw-r--r-- | usr/src/man/man1/hostname.1 | 17 | ||||
| -rw-r--r-- | usr/src/man/man1/ld.so.1.1 | 19 | ||||
| -rw-r--r-- | usr/src/man/man1/machid.1 | 25 | ||||
| -rw-r--r-- | usr/src/man/man1/pgrep.1 | 70 | ||||
| -rw-r--r-- | usr/src/man/man1/ps.1 | 30 | ||||
| -rw-r--r-- | usr/src/man/man1/sed.1 | 20 | ||||
| -rw-r--r-- | usr/src/man/man1/zlogin.1 | 81 |
11 files changed, 369 insertions, 86 deletions
diff --git a/usr/src/man/man1/Makefile b/usr/src/man/man1/Makefile index df95ce213d..68647ffc09 100644 --- a/usr/src/man/man1/Makefile +++ b/usr/src/man/man1/Makefile @@ -74,6 +74,7 @@ MANFILES= acctcom.1 \ clear.1 \ cmp.1 \ col.1 \ + column.1 \ comm.1 \ command.1 \ compress.1 \ @@ -220,6 +221,7 @@ MANFILES= acctcom.1 \ m4.1 \ mac.1 \ mach.1 \ + machid.1 \ madv.so.1.1 \ mail.1 \ mailcompat.1 \ @@ -467,6 +469,9 @@ MANLINKS= batch.1 \ helpuid.1 \ helpyorn.1 \ hist.1 \ + i286.1 \ + i386.1 \ + i486.1 \ if.1 \ intro.1 \ jsh.1 \ @@ -514,9 +519,11 @@ MANLINKS= batch.1 \ settime.1 \ sh.1 \ source.1 \ + sparc.1 \ spellin.1 \ stop.1 \ strconf.1 \ + sun.1 \ switch.1 \ ulimit.1 \ unalias.1 \ @@ -655,6 +662,12 @@ unlimit.1 := LINKSRC = limit.1 dumpkeys.1 := LINKSRC = loadkeys.1 +i286.1 := LINKSRC = machid.1 +i386.1 := LINKSRC = machid.1 +i486.1 := LINKSRC = machid.1 +sparc.1 := LINKSRC = machid.1 +sun.1 := LINKSRC = machid.1 + rmail.1 := LINKSRC = mail.1 page.1 := LINKSRC = more.1 @@ -710,7 +723,6 @@ hashcheck.1 := LINKSRC = spell.1 hashmake.1 := LINKSRC = spell.1 spellin.1 := LINKSRC = spell.1 - strconf.1 := LINKSRC = strchg.1 settime.1 := LINKSRC = touch.1 diff --git a/usr/src/man/man1/column.1 b/usr/src/man/man1/column.1 new file mode 100644 index 0000000000..a8c23310ba --- /dev/null +++ b/usr/src/man/man1/column.1 @@ -0,0 +1,129 @@ +.\" Copyright (c) 1989, 1990, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)column.1 8.1 (Berkeley) 6/6/93 +.\" $FreeBSD$ +.\" +.\" Portions Copyright (c) 2013 Joyent, Inc. All rights reserved. +.\" +.TH COLUMN 1 "Jan 10, 2013" +.SH NAME +column \- columnate lists +.SH SYNOPSIS +.LP +.nf +\fBcolumn\fR [\fB-tx\fR] [\fB-c\fR \fIcolumns\fR] [\fB-s\fR \fIsep\fR] [\fIfile\fR ... ] +.fi + +.SH DESCRIPTION +.sp +.LP +The \fBcolumn\fR +utility formats its input into multiple columns. +Rows are filled before columns. +Input is taken from +\fIfile\fR +operands, or, by default, from the standard input. +Empty lines are ignored. +.SH OPTIONS +.sp +.LP +The options are as follows: +.sp +.ne 2 +.na +\fB\fB-c\fR \fIcolumns\fR\fR +.ad +.RS 17n +Output is formatted for a display \fIcolumns\fR +wide. +.RE + +.sp +.ne 2 +.na +\fB\fB-s\fR \fIsep\fR\fR +.ad +.RS 17n +Specify a set of characters to be used to delimit columns for the +\fB-t\fR option. +.RE + +.sp +.ne 2 +.na +\fB\fB-t\fR\fR +.ad +.RS 17n +Determine the number of columns the input contains and create a table. +Columns are delimited with whitespace, by default, or with the characters +supplied using the \fBs\fR +option. +Useful for pretty-printing displays. +.RE + +.sp +.ne 2 +.na +\fB-x\fR +.ad +.RS 17n +Fill columns before filling rows. +.RE + +.SH ENVIRONMENT +The COLUMNS , LANG , LC_ALL +and +LC_CTYPE +environment variables affect the execution of +\fBcolumn\fR +as described in +\fBenviron\fR(5). + +.SH EXIT STATUS +The \fBcolumn\fR utility exits 0 on success and >0 if an error occurs. + +.SH EXAMPLES +.sp +.in +2 +.nf +(printf \&"PERM LINKS OWNER GROUP SIZE MONTH DAY \&"\ \&;\ \&\e +printf \&"HH:MM/YEAR NAME\en\&"\ \&;\ \&\e +ls -l \&| sed 1d) \&| column -t +.fi +.in -2 +.sp + + +.SH SEE ALSO +\fBls\fR(1), \fBpaste\fR(1), \fBsort\fR(1) + +.SH HISTORY +The \fBcolumn\fR command appeared in 4.3BSD-Reno. + +.SH BUGS +Input lines are limited to LINE_MAX bytes in length. diff --git a/usr/src/man/man1/crontab.1 b/usr/src/man/man1/crontab.1 index 5017199ae9..4a5d196e7c 100644 --- a/usr/src/man/man1/crontab.1 +++ b/usr/src/man/man1/crontab.1 @@ -41,6 +41,8 @@ .\" .\" .\" Copyright 1989 AT&T +.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved +.\" Copyright (c) 2011, Joyent, Inc. All Rights Reserved .\" Portions Copyright (c) 1992, X/Open Company Limited All Rights Reserved .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved .\" Copyright 2020 OmniOS Community Edition (OmniOSce) Association. @@ -62,7 +64,7 @@ crontab \- user crontab file .LP .nf -\fB/usr/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -l | -r }\fR +\fB/usr/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -g | -l | -r }\fR .fi .LP @@ -72,7 +74,7 @@ crontab \- user crontab file .LP .nf -\fB/usr/xpg4/bin/crontab\fR \fB{ -e | -l | -r }\fR [\fIusername\fR] +\fB/usr/xpg4/bin/crontab\fR \fB{ -e | -g | -l | -r }\fR [\fIusername\fR] .fi .LP @@ -87,7 +89,7 @@ crontab \- user crontab file .LP .nf -\fB/usr/xpg6/bin/crontab\fR \fB{ -e | -l | -r }\fR [\fIusername\fR] +\fB/usr/xpg6/bin/crontab\fR \fB{ -e | -g | -l | -r }\fR [\fIusername\fR] .fi .LP @@ -106,6 +108,19 @@ users' crontabs. If \fBcrontab\fR is invoked with \fIfilename\fR, this overwrites an existing \fBcrontab\fR entry for the user that invokes it, or for the user specified with the \fB-u\fR option. +.sp +.LP +Cron supports a merged crontab with entries coming from either the user's +\fB/var/spool/cron/crontabs\fR file or from the user's +\fB/etc/cron.d/crontabs\fR file. The entries in the user's +\fB/var/spool/cron/crontabs\fR file are editable whereas those in +\fB/etc/cron.d/crontabs\fR are system-defined entries which may not +be customized by the user. The dual set of crontab entries is only +of interest to system-defined users such as \fBroot\fR. Except where +otherwise explicitly indicated, all variants of the \fBcrontab\fR command +act only on the editable crontab files found in \fB/var/spool/cron/crontabs\fR. +.sp +.LP .SS "\fBcrontab\fR Access Control" Users: Access to \fBcrontab\fR is allowed: .RS +4 @@ -382,6 +397,9 @@ file using the \fB-r\fR option. If \fIusername\fR is specified, the specified user's \fBcrontab\fR file is edited, rather than the current user's \fBcrontab\fR file. This can only be done by root or by a user with the \fBsolaris.jobs.admin\fR authorization. +.sp +Only the entries in the user's \fB/var/spool/cron/crontabs\fR file are +editable. .RE .sp @@ -393,6 +411,22 @@ done by root or by a user with the \fBsolaris.jobs.admin\fR authorization. Lists the \fBcrontab\fR file for the invoking user. Only root or a user with the \fBsolaris.jobs.admin\fR authorization can specify a username following the \fB-l\fR option to list the \fBcrontab\fR file of the specified user. +.sp +Entries from the user's \fB/var/spool/cron/crontabs\fR file are listed, unless +the \fB-g\fR option is given, in which case only entries from the user's +\fB/etc/cron.d/crontabs\fR file are listed. +.RE + +.sp +.ne 2 +.na +\fB\fB-g\fR\fR +.ad +.RS 6n +In conjunction with the \fB-l\fR option, lists the global \fBcrontab\fR file +for the invoking or specified user (if authorized) instead of the editable +\fBcrontab\fR file. This option is not valid unless the \fB-l\fR option is +also given. .RE .sp @@ -651,6 +685,15 @@ list of denied users .sp .ne 2 .na +\fB\fB/etc/cron.d/crontabs\fR\fR +.ad +.RS 28n +system spool area for \fBcrontab\fR +.RE + +.sp +.ne 2 +.na \fB/var/cron/log\fR .ad .RS 28n diff --git a/usr/src/man/man1/diff.1 b/usr/src/man/man1/diff.1 index 3069149285..11be316331 100644 --- a/usr/src/man/man1/diff.1 +++ b/usr/src/man/man1/diff.1 @@ -473,6 +473,7 @@ or options are na\(:ive about creating lines consisting of a single dot .Sq \&. . .Pp +>>>>>>> master Missing NEWLINE at end of file indicates that the last line of the file in question did not have a NEWLINE. If the lines are different, they will be flagged and output, although the diff --git a/usr/src/man/man1/hostname.1 b/usr/src/man/man1/hostname.1 index 3d44d816fb..661ca1c048 100644 --- a/usr/src/man/man1/hostname.1 +++ b/usr/src/man/man1/hostname.1 @@ -1,8 +1,9 @@ .\" Copyright (c) 1992, Sun Microsystems, Inc. +.\" Copyright 2016 Joyent, Inc. .\" 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] -.Dd May 12, 2016 +.Dd Aug 26, 2016 .Dt HOSTNAME 1 .Os .Sh NAME @@ -20,6 +21,19 @@ command prints the name of the current host, as given before the prompt. The super-user can set the hostname by giving .Ar name-of-host . +.Pp +While setting the hostname changes the hostname for the running system, +it does not persist the change. +The proper way to update the hostname will vary depending on how the +system is configured. +For most systems, the persistent hostname is stored in the file +.Pa /etc/nodename . +See +.Xr nodename 5 +for more information on how to update it. +Note, the +.Pa /etc/nodename +file may be ignored in cases where the system is configured to use DHCP. .Sh OPTIONS .Bl -tag -width Ds .It Fl s @@ -27,4 +41,5 @@ Prints only the part of the hostname preceding the first dot. .El .Sh SEE ALSO .Xr uname 1 , +.Xr nodename 5 , .Xr attributes 7 diff --git a/usr/src/man/man1/ld.so.1.1 b/usr/src/man/man1/ld.so.1.1 index 76e7262919..a36df012d6 100644 --- a/usr/src/man/man1/ld.so.1.1 +++ b/usr/src/man/man1/ld.so.1.1 @@ -1,5 +1,6 @@ '\" .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved +.\" Copyright (c) 2014, Joyent, Inc. All Rights Reserved .\" 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] @@ -567,6 +568,24 @@ aid debugging. See also the \fBRTLD_DI_SETSIGNAL\fR request to .RE .sp +.ne 2 +.na +.BR LD_TOXIC_PATH, +.BR LD_TOXIC_PATH_32, +.BR LD_TOXIC_PATH_64, +.ad +.sp .6 +.RS 4n +The toxic path refers to a set of paths where by, if +.B ld.so.1 +were to load a dependency on that path, rather than loading it, it +should kill the process. This is useful when having built libraries that +while matching the native architecture of the system, are not suitable +to be used, for example, libraries that that correspond to an alternate +release of an operating system. +.RE + +.sp .LP Notice that environment variable names beginning with the characters '\fBLD_\fR' are reserved for possible future enhancements to \fBld\fR(1) and diff --git a/usr/src/man/man1/machid.1 b/usr/src/man/man1/machid.1 new file mode 100644 index 0000000000..cb95fa36b6 --- /dev/null +++ b/usr/src/man/man1/machid.1 @@ -0,0 +1,25 @@ +'\" te +.\" Copyright 1989 AT&T +.\" Copyright (c) 1999, Sun Microsystems, Inc. +.\" All Rights Reserved +.\" Copyright 2015, Joyent, Inc. +.\" 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 MACHID 1 "Feb 27, 2015" +.SH NAME +machid, sun, i286, i386, i486, sparc \- get processor type truth value + +.SH DESCRIPTION +.sp +.LP +These commands are obsolete and may be removed in a future version of the +software. +.sp +.ne 2 +.na +.SH NOTES +.sp +.LP +The \fBmachid\fR family of commands is obsolete. Use \fBuname\fR \fB-p\fR and +\fBuname\fR \fB-m\fR instead. diff --git a/usr/src/man/man1/pgrep.1 b/usr/src/man/man1/pgrep.1 index a5482fc992..6a02aeff3e 100644 --- a/usr/src/man/man1/pgrep.1 +++ b/usr/src/man/man1/pgrep.1 @@ -1,13 +1,13 @@ '\" te -.\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved +.\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved +.\" Copyright 2019 Joyent, Inc. .\" 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 PGREP 1 "Jan 17, 2014" +.TH PGREP 1 "Aug 13, 2019" .SH NAME pgrep, pkill \- find or signal processes by name and other attributes .SH SYNOPSIS -.LP .nf \fBpgrep\fR [\fB-flvx\fR] [\fB-n\fR | \fB-o\fR] [\fB-d\fR \fIdelim\fR] [\fB-P\fR \fIppidlist\fR] [\fB-g\fR \fIpgrplist\fR] [\fB-s\fR \fIsidlist\fR] [\fB-u\fR \fIeuidlist\fR] [\fB-U\fR \fIuidlist\fR] @@ -26,8 +26,6 @@ pgrep, pkill \- find or signal processes by name and other attributes .fi .SH DESCRIPTION -.sp -.LP The \fBpgrep\fR utility examines the active processes on the system and reports the process \fBID\fRs of the processes whose attributes match the criteria specified on the command line. Each process \fBID\fR is printed as a decimal @@ -74,8 +72,6 @@ process is signaled as if by \fBkill\fR(1) instead of having its process \fBID\fR printed. A signal name or number may be specified as the first command line option to \fBpkill\fR. .SH OPTIONS -.sp -.LP The following options are supported: .sp .ne 2 @@ -104,11 +100,11 @@ character. The \fB-d\fR option is only valid when specified as an option to \fB\fB-f\fR\fR .ad .RS 17n -The regular expression \fIpattern\fR should be matched against the full process -argument string (obtained from the \fBpr_psargs\fR field of the -\fB/proc/\fInnnnn\fR/psinfo\fR file). If no \fB-f\fR option is specified, the -expression is matched only against the name of the executable file (obtained -from the \fBpr_fname\fR field of the \fB/proc/\fInnnnn\fR/psinfo\fR file). +The regular expression \fIpattern\fR should be matched against all the process +arguments, not just the executable file name. +The process arguments are read from \fB\fB/proc/\fInnnnn\fR\fB/cmdline\fR: this +does not truncate the arguments, but reflects the current value, which may have +been changed. .RE .sp @@ -150,11 +146,9 @@ project \fBID\fR. \fB\fB-l\fR\fR .ad .RS 17n -Long output format. Prints the process name along with the process \fBID\fR of -each matching process. The process name is obtained from the \fBpr_psargs\fR or -\fBpr_fname\fR field, depending on whether the \fB-f\fR option was specified -(see above). The \fB-l\fR option is only valid when specified as an option to -\fBpgrep\fR. +Long output format. Prints the process arguments along with the process \fBID\fR of +each matching process, depending on how the \fB-f\fR option was specified. +The \fB-l\fR option is only valid when specified as an option to \fBpgrep\fR. .RE .sp @@ -258,8 +252,8 @@ which meet the specified matching criteria. .RS 17n Matches only processes whose executable file name (ignoring any path) \fBexactly\fR matches the specified \fIpattern\fR. However, when used with -f, -the \fIpattern\fR should be matched against the full process argument -string. For example if there exists a process `/bin/ls /home' then: +the \fIpattern\fR is matched against the full process argument +string. For example, if there exists a process `/bin/ls /home' then: .sp .in +2 .nf @@ -308,8 +302,6 @@ one of the symbolic names defined in \fBsignal.h\fR(3HEAD) without the .RE .SH OPERANDS -.sp -.LP The following operand is supported: .sp .ne 2 @@ -323,7 +315,6 @@ either the executable file name or full process argument string. See .RE .SH EXAMPLES -.LP \fBExample 1 \fRObtaining a Process ID .sp .LP @@ -352,9 +343,20 @@ example% \fBpkill -n xterm\fR .in -2 .sp -.SH EXIT STATUS +.LP +\fBExample 3 \fRMatching against all process arguments .sp .LP +Match against any process argument and report the arguments: + +.sp +.in +2 +.nf +example% \fBpgrep -fl myfile.txt\fR +.fi +.in -2 +.sp +.SH EXIT STATUS The following exit values are returned: .sp .ne 2 @@ -393,17 +395,22 @@ A fatal error occurred. .RE .SH FILES -.sp .ne 2 .na -\fB\fB/proc/\fInnnnn\fR/psinfo\fR\fR +\fB\fB/proc/\fInnnnn\fR\fB/psinfo\fR\fR .ad .RS 22n Process information files .RE -.SH SEE ALSO .sp +.ne 2 +.na +\fB\fB/proc/\fInnnnn\fR\fB/cmdline\fR\fR +.ad +.RS 22n +Process arguments. +.RE .LP .BR kill (1), .BR proc (1), @@ -417,14 +424,11 @@ Process information files .BR regex (7), .BR zones (7) .SH NOTES -.sp -.LP Both utilities match the \fBERE\fR \fIpattern\fR argument against either the -\fBpr_fname\fR or \fBpr_psargs\fR fields of the -\fB/proc/\fR\fInnnnn\fR\fB/psinfo\fR files. The lengths of these strings are -limited according to definitions in \fB<sys/procfs.h>\fR\&. Patterns which can -match strings longer than the current limits may fail to match the intended set -of processes. +\fBpr_fname\fR field of the \fB/proc/\fR\fInnnnn\fR\fB/psinfo\fR file, or +\fB/proc/\fR\fInnnnn\fR\fB/cmdline\fR, and may be truncated. +Patterns which can match strings longer than the current limits may fail to +match the intended set of processes. .sp .LP If the \fIpattern\fR argument contains \fBERE\fR meta-characters which are also diff --git a/usr/src/man/man1/ps.1 b/usr/src/man/man1/ps.1 index 5eb0b70f3b..43a8b5b0a4 100644 --- a/usr/src/man/man1/ps.1 +++ b/usr/src/man/man1/ps.1 @@ -44,13 +44,12 @@ .\" Portions Copyright (c) 1992, X/Open Company Limited All Rights Reserved .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved .\" Copyright (c) 2013 Gary Mills -.\" Copyright (c) 2018, Joyent, Inc. +.\" Copyright 2019 Joyent, Inc. .\" -.TH PS 1 "August 22, 2018" +.TH PS 1 "August 28, 2019" .SH NAME ps \- report process status .SH SYNOPSIS -.LP .nf \fBps\fR [\fB-aAcdefjHlLPWyZ\fR] [\fB-g\fR \fIgrplist\fR] [\fB-h\fR \fIlgrplist\fR] [\fB-n\fR \fInamelist\fR] [\fB-o\fR \fIformat\fR]... [\fB-p\fR \fIproclist\fR] @@ -59,7 +58,6 @@ ps \- report process status .fi .SH DESCRIPTION -.LP The \fBps\fR command prints information about active processes. Without options, \fBps\fR prints information about processes that have the same effective user \fBID\fR and the same controlling terminal as the invoker. The @@ -71,8 +69,10 @@ displayed is controlled by the options. Some options accept lists as arguments. Items in a list can be either separated by commas or else enclosed in quotes and separated by commas or spaces. Values for \fIproclist\fR and \fIgrplist\fR must be numeric. -.SH OPTIONS +.sp .LP +The \fBps\fR command also accepts BSD-style options. See \fBps\fR(1b). +.SH OPTIONS The following options are supported: .sp .ne 2 @@ -372,9 +372,9 @@ Many of the options shown are used to select processes to list. If any are specified, the default list is ignored and \fBps\fR selects the processes represented by the inclusive OR of all the selection-criteria options. .SH DISPLAY FORMATS -.LP -Under the \fB-f\fR option, \fBps\fR tries to determine the command name and -arguments given when the process was created by examining the user block. +Under the \fB-f\fR option, \fBps\fR uses the \fB\fB/proc/\fInnnnn\fR\fB/cmdline\fR\fR +file to read the full process arguments. The process may have changed these +since it was started. Failing this, the command name is printed, as it would have appeared without the \fB-f\fR option, in square brackets. .sp @@ -605,8 +605,8 @@ The execution time for the lwp being reported. \fB\fBCMD\fR(all)\fR .ad .RS 14n -The command name (the full command name and its arguments, up to a limit of 80 -characters, are printed under the \fB-f\fR option). +The command name (or, with the \fB-f\fR option, the full current process +arguments). .RE .sp @@ -664,7 +664,6 @@ lwp. A process that has exited and has a parent, but has not yet been waited for by the parent, is marked \fB<defunct>\fR\&. .SS "\fB-o\fR format" -.LP The \fB-o\fR option allows the output format to be specified under user control. .sp @@ -882,9 +881,9 @@ is a version of the argument list as it was passed to the command when it started, or is a version of the arguments as they might have been modified by the application. Applications cannot depend on being able to modify their argument list and having that modification be reflected in the output of -\fBps\fR. The illumos implementation limits the string to 80 bytes; the string -is the version of the argument list as it was passed to the command when it -started. +\fBps\fR. However, the current implementation will display the full modified +process arguments when given the \fB-f\fR argument; otherwise this is the +initial process arguments, but limited to 80 bytes. .RE .sp @@ -1241,7 +1240,6 @@ ctid CTID .TE .SH EXAMPLES -.LP \fBExample 1 \fRUsing \fBps\fR Command .sp .LP @@ -1289,7 +1287,6 @@ number of text columns to display. .RE .SH EXIT STATUS -.LP The following exit values are returned: .sp .ne 2 @@ -1382,7 +1379,6 @@ Standard See \fBstandards\fR(7). .BR zones (7), .BR getty (8) .SH NOTES -.LP Things can change while \fBps\fR is running. The snapshot it gives is true only for a split-second, and it might not be accurate by the time you see it. Some data printed for defunct processes is irrelevant. diff --git a/usr/src/man/man1/sed.1 b/usr/src/man/man1/sed.1 index 4261c2df83..3eca2b5418 100644 --- a/usr/src/man/man1/sed.1 +++ b/usr/src/man/man1/sed.1 @@ -45,7 +45,8 @@ [\fB\-Ealnr\fP] [\fB\-e\fP \fIcommand\fP] [\fB\-f\fP \fIcommand_file\fP] -[\fB\-I\fP[\fIextension\fP] | \fB\-i\fP[\fIextension\fP]] +[\fB\-I\fP \fIextension\fP] +[\fB\-i\fP \fIextension\fP] [\fIfile ...\fP] .SH DESCRIPTION The @@ -98,11 +99,16 @@ Append the editing commands found in the file to the list of commands. The editing commands should each be listed on a separate line. .TP -\fB\-I\fP[\fIextension\fP] -Edit files in-place, saving backups if \fIextension\fP was specified. -It is not recommended to omit saving backups when in-place editing files, -as you risk corruption or partial content in situations where disk -space is exhausted, etc. +\fB\-I\fP \fIextension\fP +Edit files in-place, saving backups with the specified +\fIextension\fP. +If a zero-length +\fIextension\fP +is given, no backup will be saved. +It is not recommended to give a zero-length +\fIextension\fP +when in-place editing files, as you risk corruption or partial content +in situations where disk space is exhausted, etc. Note that in-place editing with \fB\-I\fP @@ -120,7 +126,7 @@ where using \fB\-i\fP is desired. .TP -\fB\-i\fP[\fIextension\fP] +\fB\-i\fP \fIextension\fP Edit files in-place similarly to \fB\-I\fP, but treat each file independently from other files. diff --git a/usr/src/man/man1/zlogin.1 b/usr/src/man/man1/zlogin.1 index 0b7c9d2cc1..8d12560b96 100644 --- a/usr/src/man/man1/zlogin.1 +++ b/usr/src/man/man1/zlogin.1 @@ -13,43 +13,43 @@ .\" Portions Copyright [yyyy] [name of copyright owner] .\" Copyright 2013 DEY Storage Systems, Inc. .\" Copyright (c) 2014 Gary Mills +.\" Copyright (c) 2015, Joyent, Inc. All Rights Reserved .\" Copyright 2015 Nexenta Systems, Inc. All rights reserved. -.TH ZLOGIN 1 "Mar 17, 2015" +.TH ZLOGIN 1 "Mar 30, 2015" .SH NAME zlogin \- enter a zone .SH SYNOPSIS .LP .nf -\fBzlogin\fR [\fB-dCEQ\fR] [\fB-e\fR \fIc\fR] [\fB-l\fR \fIusername\fR] \fIzonename\fR +\fBzlogin\fR [\fB-dCEINQ\fR] [\fB-e\fR \fIc\fR] [\fB-l\fR \fIusername\fR] \fIzonename\fR .fi .LP .nf -\fBzlogin\fR [\fB-nEQS\fR] [\fB-e\fR \fIc\fR] [\fB-l\fR \fIusername\fR] \fIzonename\fR \fIutility\fR +\fBzlogin\fR [\fB-inEQS\fR] [\fB-e\fR \fIc\fR] [\fB-l\fR \fIusername\fR] \fIzonename\fR \fIutility\fR [\fIargument\fR]... .fi .SH DESCRIPTION -.sp .LP The \fBzlogin\fR utility is used by the administrator to enter an operating system zone. Only a superuser operating in the global system zone can use this utility. .sp .LP -\fBzlogin\fR operates in one of three modes: +\fBzlogin\fR operates in one of four modes: .sp .ne 2 .na \fBInteractive Mode\fR .ad .RS 24n -If no utility argument is given and the stdin file descriptor for the -\fBzlogin\fR process is a tty device, \fBzlogin\fR operates in \fBinteractive -mode\fR. In this mode, \fBzlogin\fR creates a new pseudo terminal for use -within the login session. Programs requiring a tty device, for example, -\fBvi\fR(1), work properly in this mode. In this mode, \fBzlogin\fR invokes -\fBlogin\fR(1) to provide a suitable login session. +If no utility argument is given or if the \fB-i\fR option is specified, and the +stdin file descriptor for the \fBzlogin\fR process is a tty device, \fBzlogin\fR +operates in \fBinteractive mode\fR. In this mode, \fBzlogin\fR creates a new +pseudo terminal for use within the login session. Programs requiring a tty +device, for example, \fBvi\fR(1), work properly in this mode. In this mode, +\fBzlogin\fR invokes \fBlogin\fR(1) to provide a suitable login session. .RE .sp @@ -58,11 +58,12 @@ within the login session. Programs requiring a tty device, for example, \fBNon-Interactive Mode\fR .ad .RS 24n -If a utility is specified, \fBzlogin\fR operates in \fBnon-interactive mode\fR. -This mode can be useful for script authors since stdin, stdout, and stderr are -preserved and the exit status of \fIutility\fR is returned upon termination. In -this mode, \fBzlogin\fR invokes \fBsu\fR(8) in order to set up the user's -environment and to provide a login environment. +If a utility is specified and the \fB-i\fR option is not specified, \fBzlogin\fR +operates in \fBnon-interactive mode\fR. This mode can be useful for script +authors since stdin, stdout, and stderr are preserved and the exit status of +\fIutility\fR is returned upon termination. In this mode, \fBzlogin\fR invokes +\fBsu\fR(8) in order to set up the user's environment and to provide a login +environment. .sp The specified command is passed as a string and interpreted by a shell running in the non-global zone. See \fBrsh\fR(1). @@ -80,8 +81,17 @@ available once the zone is in the installed state. Connections to the console are persistent across reboot of the zone. .RE -.SH OPTIONS .sp +.ne 2 +.na +\fBStandalone-processs Interactive Mode\fR +.ad +.RS 24n +If the \fB-I\fR option is specified the user is connected to the zone's stdin, +stdout and stderr \fBzfd(7D)\fR devices. +.RE + +.SH OPTIONS .LP The following options are supported: .sp @@ -127,6 +137,25 @@ login by using the escape sequence character. .sp .ne 2 .na +\fB\fB-i\fR\fR +.ad +.RS 15n +Forces interactive mode when a utility argument is specified. +.RE + +.sp +.ne 2 +.na +\fB\fB-I\fR\fR +.ad +.RS 15n +Connects to the zone's \fBzfd(7D)\fR devices. +.RE + +.sp +.sp +.ne 2 +.na \fB\fB-l\fR \fIusername\fR\fR .ad .RS 15n @@ -149,6 +178,17 @@ and the shell which invokes \fBzlogin\fR both read from standard input. .sp .ne 2 .na +\fB-N\fR +.ad +.RS 15n +Nohup. This may only be used with the -I option to avoid sending EOF to the zfd +device when zlogin's stdin receives EOF. It can also be toggled by sending +\fBSIGUSR1\fR to an attached zlogin process. +.RE + +.sp +.ne 2 +.na \fB-Q\fR .ad .RS 15n @@ -172,7 +212,6 @@ other forms of login have become impossible. .RE .SS "Escape Sequences" -.sp .LP Lines that you type that start with the tilde character (\fB~\fR) are "escape sequences". The escape character can be changed using the \fB-e\fR option. @@ -187,12 +226,10 @@ host breaks the connection with no warning to the zone's end. .RE .SH SECURITY -.sp .LP Once a process has been placed in a zone other than the global zone, the process cannot change zone again, nor can any of its children. .SH OPERANDS -.sp .LP The following operands are supported: .sp @@ -223,7 +260,6 @@ Arguments passed to the utility. .RE .SH EXIT STATUS -.sp .LP In interactive and non-interactive modes, the \fBzlogin\fR utility exits when the command or shell in the non-global zone exits. In non-interactive mode, the @@ -268,7 +304,6 @@ mode. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(7) for descriptions of the following attributes: .sp @@ -284,7 +319,6 @@ Interface Stability Evolving .TE .SH SEE ALSO -.sp .LP .BR login (1), .BR rsh (1), @@ -295,7 +329,6 @@ Interface Stability Evolving .BR zoneadm (8), .BR zonecfg (8) .SH NOTES -.sp .LP \fBzlogin\fR fails if its open files or any portion of its address space corresponds to an NFS file. This includes the executable itself or the shared |