Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge the two lists.

This commit is contained in:
christos 2011-02-01 21:03:53 +00:00
parent f46c12c85c
commit 9f6dc01c41
2 changed files with 43 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
share/man/man7/symlink.7
View File

@ -1,4 +1,4 @@
.\" $NetBSD: symlink.7,v 1.17 2009/06/26 15:50:17 christos Exp $
.\" $NetBSD: symlink.7,v 1.18 2011/02/01 21:03:53 christos Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@ -29,7 +29,7 @@
.\"
.\" @(#)symlink.7 8.3 (Berkeley) 3/31/94
.\"
.Dd June 26, 2009
.Dd February 1, 2011
.Dt SYMLINK 7
.Os
.Sh NAME
@ -483,10 +483,34 @@ Expands to the machine's host name, as set by
.Xr sethostname 3 .
.It @emul
Expands to the name of the current process's emulation.
Defaults to
.Dv netbsd .
Other valid emulations are:
.Dv aout ,
.Dv aoutm68k ,
.Dv darwin ,
.Dv freebsd ,
.Dv ibcs2 ,
.Dv irix ,
.Dv linux ,
.Dv linux32 ,
.Dv m68k4k ,
.Dv mach ,
.Dv netbsd32 ,
.Dv osf1 ,
.Dv pecoff ,
.Dv sunos ,
.Dv sunos32 ,
.Dv svr4 ,
.Dv svr4_32 ,
.Dv ultrix ,
.Dv vax1k .
.It @kernel_ident
Expands to the name of the
.Xr config 1
file used to generate the running kernel.
For example
.Dv GENERIC .
.It @machine
Expands to the value of
.Li MACHINE
@ -495,6 +519,9 @@ for the system
equivalent to the output of
.Dq uname -m
.Pc .
(
.Xr sysctl 3
.Dq hw.machine )
.It @machine_arch
Expands to the value of
.Li MACHINE_ARCH
@ -503,18 +530,27 @@ for the system
equivalent to the output of
.Dq uname -p
.Pc .
(
.Xr sysctl 3
.Dq hw.machine_arch )
.It @osrelease
Expands to the operating system release of the running kernel
.Po
equivalent to the output of
.Dq uname -r
.Pc .
(
.Xr sysctl 3
.Dq kern.osrelease )
.It @ostype
Expands to the operating system type of the running kernel
.Po
equivalent to the output of
.Dq uname -s
.Pc .
(
.Xr sysctl 3
.Dq kern.ostype )
This will always be
.Dq NetBSD
on

70
share/man/man7/sysctl.7
View File

@ -1,4 +1,4 @@
.\" $NetBSD: sysctl.7,v 1.59 2011/02/01 20:43:48 christos Exp $
.\" $NetBSD: sysctl.7,v 1.60 2011/02/01 21:03:53 christos Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@ -151,70 +151,10 @@ Defaults to no variable expansion,
.Dv 0 .
Variables are of the form
.Li @name
and the following names are supported:
.Bl -tag -width "kernel_ident"
.It domainname
The domain name as determined by
.Xr getdomainname 2
.It emul
The current process emulation name.
Defaults to
.Dv netbsd .
Other valid emulations are:
.Dv aout ,
.Dv aoutm68k ,
.Dv darwin ,
.Dv freebsd ,
.Dv ibcs2 ,
.Dv irix ,
.Dv linux ,
.Dv linux32 ,
.Dv m68k4k ,
.Dv mach ,
.Dv netbsd32 ,
.Dv osf1 ,
.Dv pecoff ,
.Dv sunos ,
.Dv sunos32 ,
.Dv svr4 ,
.Dv svr4_32 ,
.Dv ultrix ,
.Dv vax1k .
.It gid
The effective group id of the current process.
.It hostname
The host name as determined by
.Xr gethostname 2
.It kernel_ident
The kernel identifier, as specified by config.
For example
.Dv GENERIC .
.It machine
The type of machine as determined by the
.Xr sysctl 3
.Dq hw.machine .
.It machine_arch
The architecture of the processor as determined by the
.Xr sysctl 3
.Dq hw.machine_arch .
.It osrelease
The kernel release number as determined by the
.Xr sysctl 3
.Dq kern.osrelease .
.Xr sysctl 3
.It ostype
The kernel operating system type as determined by the
.Xr sysctl 3
.Dq kern.ostype .
Defaults to
.Dv NetBSD .
.It rgid
The real group id of the current process.
.It ruid
The real user id of the current process.
.It uid
The effective user id of the current process.
.El
and the variables supported are described in
.Xr symlink 7
under
.Dq "MAGIC SYMLINKS" .
.El
.Pp
A second level name for controlling the