diff options
| -rw-r--r-- | sbin/sysctl/sysctl.8 | 29 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.c | 6 |
2 files changed, 13 insertions, 22 deletions
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 40ff24330e7..f94db1845d9 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.8,v 1.141 2007/07/19 14:50:16 jmc Exp $ +.\" $OpenBSD: sysctl.8,v 1.142 2007/11/11 15:48:35 jmc Exp $ .\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $ .\" .\" Copyright (c) 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)sysctl.8 8.2 (Berkeley) 5/9/95 .\" -.Dd $Mdocdate: July 19 2007 $ +.Dd $Mdocdate: November 11 2007 $ .Dt SYSCTL 8 .Os .Sh NAME @@ -39,10 +39,10 @@ .Sh SYNOPSIS .Nm sysctl .Op Fl n -.Ar variable ... +.Ar name ... .Nm sysctl -.Op Fl nqw -.Ar variable Ns = Ns Ar value ... +.Op Fl nq +.Ar name Ns = Ns Ar value ... .Nm sysctl .Op Fl n .Fl Aa @@ -65,12 +65,6 @@ For example, to list all the machdep variables: .Pp When setting a variable, the MIB name should be followed by an equal sign and the new value. -Variables are set implicitly using the -.Ar variable Ns = Ns Ar value -syntax, or explicitly with the -.Fl w -option. -Both forms are identical. .Pp The options are as follows: .Bl -tag -width xxx @@ -92,14 +86,11 @@ For example, to set the psize shell variable to the pagesize of the hardware: Suppress all output when setting a variable. This option overrides the behaviour of .Fl n . -.It Fl w -Set a variable. -It must be followed by a -.Ar variable Ns = Ns Ar value -assignment. -The -.Fl w -flag is optional when setting a variable. +.It Ar name Ns = Ns Ar value +Attempt to set the specified variable +.Ar name +to +.Ar value . .El .Pp The information available from diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 092058aeb7d..d5f17bcbb52 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.149 2007/06/04 13:17:54 henning Exp $ */ +/* $OpenBSD: sysctl.c,v 1.150 2007/11/11 15:48:35 jmc Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -40,7 +40,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95"; #else -static const char rcsid[] = "$OpenBSD: sysctl.c,v 1.149 2007/06/04 13:17:54 henning Exp $"; +static const char rcsid[] = "$OpenBSD: sysctl.c,v 1.150 2007/11/11 15:48:35 jmc Exp $"; #endif #endif /* not lint */ @@ -2426,7 +2426,7 @@ usage(void) { (void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n", - "sysctl [-n] variable ...", "sysctl [-nqw] variable=value ...", + "sysctl [-n] name ...", "sysctl [-nq] name=value ...", "sysctl [-n] -Aa"); exit(1); } |