diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2003-05-10 06:33:40 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2003-05-10 06:33:40 +0000 |
commit | b72712f77c675d80dff8b9c418d0591489aade7e (patch) | |
tree | 571bc89268ab132c61adaf0a13aea13cd29b271c | |
parent | d9a9517f56654b7981385620ce38237dc463cdb8 (diff) |
document that kernel automatically handles first swap partition
("swap_device" in swapctl -l) and does not need to be added to /etc/fstab.
krw@, fries@, rohee@, millert@, henning@ ok.
-rw-r--r-- | sbin/swapctl/swapctl.8 | 16 | ||||
-rw-r--r-- | share/man/man5/fstab.5 | 3 | ||||
-rw-r--r-- | share/man/man8/afterboot.8 | 5 |
3 files changed, 18 insertions, 6 deletions
diff --git a/sbin/swapctl/swapctl.8 b/sbin/swapctl/swapctl.8 index 3fe7f1bbbc8..772e7fdf600 100644 --- a/sbin/swapctl/swapctl.8 +++ b/sbin/swapctl/swapctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: swapctl.8,v 1.20 2003/02/13 08:23:39 jmc Exp $ +.\" $OpenBSD: swapctl.8,v 1.21 2003/05/10 06:33:39 jmc Exp $ .\" $NetBSD: swapctl.8,v 1.14 1998/05/22 18:27:52 msaitoh Exp $ .\" .\" Copyright (c) 1997 Matthew R. Green @@ -78,6 +78,20 @@ with the .Fl A option. .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 diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5 index c5dabe469b6..83f856e8b59 100644 --- a/share/man/man5/fstab.5 +++ b/share/man/man5/fstab.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fstab.5,v 1.24 2003/05/07 17:41:48 jmc Exp $ +.\" $OpenBSD: fstab.5,v 1.25 2003/05/10 06:33:38 jmc Exp $ .\" $NetBSD: fstab.5,v 1.5.2.1 1995/11/16 20:11:11 pk Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 @@ -260,7 +260,6 @@ Here is a sample file: .Bd -literal -offset indent /dev/sd0a / ffs rw 1 1 -/dev/sd0b none swap sw 0 0 /dev/sd0e /var ffs rw,nodev,nosuid 1 2 #/dev/sd0f /tmp ffs rw,nodev,nosuid 1 2 /dev/sd0b /tmp mfs rw,nodev,nosuid,-s=153600 0 0 diff --git a/share/man/man8/afterboot.8 b/share/man/man8/afterboot.8 index 963229301c7..3a827d232c4 100644 --- a/share/man/man8/afterboot.8 +++ b/share/man/man8/afterboot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: afterboot.8,v 1.80 2003/04/14 06:51:48 jmc Exp $ +.\" $OpenBSD: afterboot.8,v 1.81 2003/05/10 06:33:38 jmc Exp $ .\" .\" Copyright (c) 1997 Marshall M. Midden .\" All rights reserved. @@ -375,7 +375,6 @@ Example: .Bd -literal -offset indent # cat /etc/fstab /dev/sd0a / ffs rw 1 1 -/dev/sd0b none swap sw 0 0 /dev/sd0d /usr ffs rw,nodev 1 2 /dev/sd0e /var ffs rw,nodev,nosuid 1 3 /dev/sd0g /tmp ffs rw,nodev,nosuid 1 4 @@ -398,7 +397,7 @@ Filesystem 1024-blocks Used Avail Capacity Mounted on # pstat -s Device 512-blocks Used Avail Capacity Priority -/dev/sd0b 131072 84656 46416 65% 0 +swap_device 131072 84656 46416 65% 0 .Ed .Pp Edit |