summaryrefslogtreecommitdiff
path: root/sbin/swapctl
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-04-17 20:17:13 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-04-17 20:17:13 +0000
commit152fb505e4fc875ee9e9bee9b7bc7daf5d692b91 (patch)
treea52c9e1247c54c99b0791bcc8e89df885a83c095 /sbin/swapctl
parent86714bb2a8625f342c194039dd0775536cc5a7ef (diff)
Tweak verbiage, bring examples up to date.
Suggestions from deraadt@ and jmc@. ok jmc@
Diffstat (limited to 'sbin/swapctl')
-rw-r--r--sbin/swapctl/swapctl.832
1 files changed, 11 insertions, 21 deletions
diff --git a/sbin/swapctl/swapctl.8 b/sbin/swapctl/swapctl.8
index 3cd96d4e307..9e80c6a2d33 100644
--- a/sbin/swapctl/swapctl.8
+++ b/sbin/swapctl/swapctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: swapctl.8,v 1.30 2010/09/03 10:08:22 jmc Exp $
+.\" $OpenBSD: swapctl.8,v 1.31 2011/04/17 20:17:12 krw Exp $
.\" $NetBSD: swapctl.8,v 1.14 1998/05/22 18:27:52 msaitoh Exp $
.\"
.\" Copyright (c) 1997 Matthew R. Green
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: April 17 2011 $
.Dt SWAPCTL 8
.Os
.Sh NAME
@@ -72,20 +72,6 @@ in which case
it acts as
.Ic swapctl -A .
.Pp
-.Sy Note :
-The initial swap device (root disk, partition b) is handled automatically
-by the kernel and does
-.Em not
-need to be added to
-.Pa /etc/fstab
-or added via
-.Nm swapctl .
-It will show up as
-.Qq swap_device
-in the output displayed with the
-.Fl l
-flag.
-.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl A
@@ -168,14 +154,18 @@ may be needed before all file systems are available, such as during
disk checks of large file systems.
.El
.Sh SWAP OPTIONS
-When parsing the
-.Pa /etc/fstab
-file for swap devices, lines such as the following specify additional swap
-devices:
+Lines such as
.Bd -literal -offset indent
-/dev/sd1b none swap sw 0 0
+/dev/sd1b none swap sw
+d48d0e3fc1c39531.k none swap sw
.Ed
.Pp
+specify swap devices in
+.Pa /etc/fstab .
+The initial swap device (root disk, partition b) does not need to appear in
+.Pa /etc/fstab ,
+although it may.
+.Pp
Additional flags include:
.Pp
.Bl -tag -width nfsmntpt=/path -compact