On Sun, Apr 17, 2011 at 07:26:28AM +0100, Jason McIntyre wrote: > On Sat, Apr 16, 2011 at 07:29:27PM -0400, Kenneth R Westerback wrote: > > > > My suggested man page tweaks are below. > > > > .... Ken > > > > Index: share/man/man5/fstab.5 > > =================================================================== > > RCS file: /cvs/src/share/man/man5/fstab.5,v > > retrieving revision 1.44 > > diff -u -p -r1.44 fstab.5 > > --- share/man/man5/fstab.5 28 Sep 2010 17:37:20 -0000 1.44 > > +++ share/man/man5/fstab.5 16 Apr 2011 23:26:22 -0000 > > @@ -284,7 +284,8 @@ swap /tmp mfs rw,nodev,nosuid,-s=153600 > > /dev/sd0h /usr/local ffs rw,nodev 1 2 > > /dev/sd0i /home ffs rw,nodev,nosuid 1 2 > > /dev/sd0j /usr/src ffs rw,nodev,nosuid,softdep 1 2 > > -/dev/sd1b none swap sw 0 0 > > +/dev/sd0b none swap sw > > +/dev/sd1b none swap sw > > i would probably leave out the sd0b entry, just because we are already > showing an mfs entry. > > > /dev/cd0a /cdrom cd9660 ro,noauto 0 0 > > 5b27c2761a9b0b06.i /mnt/key msdos rw,noauto 0 0 > > server:/export/ports /usr/ports nfs rw,nodev,nosuid,soft,intr 0 0 > > Index: sbin/swapctl/swapctl.8 > > =================================================================== > > RCS file: /cvs/src/sbin/swapctl/swapctl.8,v > > retrieving revision 1.30 > > diff -u -p -r1.30 swapctl.8 > > --- sbin/swapctl/swapctl.8 3 Sep 2010 10:08:22 -0000 1.30 > > +++ sbin/swapctl/swapctl.8 16 Apr 2011 23:26:22 -0000 > > @@ -74,9 +74,7 @@ it acts as > > .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 > > +by the kernel and does not need to be added to > > .Pa /etc/fstab > > or added via > > .Nm swapctl . > > @@ -85,6 +83,9 @@ It will show up as > > in the output displayed with the > > .Fl l > > flag. > > +If present in > > +.Pa /etc/fstab > > +it will be silently ignored. > > theo suggested that this block of text just be removed. i think i agree > with that - it's now looking more likely to confuse people than help. > > > .Pp > > The options are as follows: > > .Bl -tag -width Ds > > @@ -173,7 +174,7 @@ When parsing the > > file for swap devices, lines such as the following specify additional swap > > devices: > > .Bd -literal -offset indent > > -/dev/sd1b none swap sw 0 0 > > +/dev/sd1b none swap sw > > .Ed > > .Pp > > Additional flags include: > > > > otherwise i'm ok with the changes. > jmc >
I am uncomfortable with removing the swapctl verbiasge, but I think it is much more digestable if broken up and distributed as below. I moved the swap lines in the example to the top, where they are likely to have been put by the install process. Keeping sd0b seems better to me, but marginally so. .... Ken Index: sbin/swapctl/swapctl.8 =================================================================== RCS file: /cvs/src/sbin/swapctl/swapctl.8,v retrieving revision 1.30 diff -u -p -r1.30 swapctl.8 --- sbin/swapctl/swapctl.8 3 Sep 2010 10:08:22 -0000 1.30 +++ sbin/swapctl/swapctl.8 17 Apr 2011 16:29:18 -0000 @@ -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 @@ -136,6 +122,8 @@ option uses 1024 byte blocks instead of The .Fl l option lists the current swap devices and files, and their usage statistics. +The initial swap device (root disk, partition b) will show up as +.Qq swap_device . .It Fl p Ar priority The .Fl p @@ -168,13 +156,16 @@ may be needed before all file systems ar 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 the following specify swap devices: .Bd -literal -offset indent -/dev/sd1b none swap sw 0 0 +/dev/sd1b none swap sw +d48d0e3fc1c39531.k none swap sw .Ed +.Pp +The initial swap device (root disk, partition b) does not need to appear in +.Pa /etc/fstab , +although it can. .Pp Additional flags include: .Pp Index: share/man/man5/fstab.5 =================================================================== RCS file: /cvs/src/share/man/man5/fstab.5,v retrieving revision 1.44 diff -u -p -r1.44 fstab.5 --- share/man/man5/fstab.5 28 Sep 2010 17:37:20 -0000 1.44 +++ share/man/man5/fstab.5 17 Apr 2011 16:29:18 -0000 @@ -276,6 +276,8 @@ Here is a sample .Pa /etc/fstab file: .Bd -literal -offset indent +/dev/sd0b none swap sw +/dev/sd1b none swap sw /dev/sd0a / ffs rw 1 1 /dev/sd0e /var ffs rw,nodev,nosuid 1 2 #/dev/sd0f /tmp ffs rw,nodev,nosuid 1 2 @@ -284,7 +286,6 @@ swap /tmp mfs rw,nodev,nosuid,-s=153600 /dev/sd0h /usr/local ffs rw,nodev 1 2 /dev/sd0i /home ffs rw,nodev,nosuid 1 2 /dev/sd0j /usr/src ffs rw,nodev,nosuid,softdep 1 2 -/dev/sd1b none swap sw 0 0 /dev/cd0a /cdrom cd9660 ro,noauto 0 0 5b27c2761a9b0b06.i /mnt/key msdos rw,noauto 0 0 server:/export/ports /usr/ports nfs rw,nodev,nosuid,soft,intr 0 0
