The update will also expand kernel version numbers to have a month and year next to them. This should help users can get idea how long, for example, swap v1 has been around. Signed-off-by: Sami Kerola <kerolasa@xxxxxx> --- disk-utils/mkswap.8 | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8 index 00c089d..02bbd66 100644 --- a/disk-utils/mkswap.8 +++ b/disk-utils/mkswap.8 @@ -8,16 +8,9 @@ mkswap \- set up a Linux swap area .SH SYNOPSIS .B mkswap -.RB [ \-c ] -.RB [ \-f ] -.RB [ \-p -.IR PSZ ] -.RB [ \-L -.IR label ] -.RB [ \-U -.IR uuid ] +.RB [OPTION] .I device -.RI [ size ] +.RI [size] .SH DESCRIPTION .B mkswap sets up a Linux swap area on a device or in a file. @@ -75,12 +68,12 @@ label (SUN, BSD, ...) or on a whole disk (e.g. /dev/sda). .SH OPTIONS .TP -.B \-c +.BR \-c , " \-\-check" Check the device (if it is a block device) for bad blocks before creating the swap area. If any are found, the count is printed. .TP -.B \-f +.BR \-f , " \-\-force" Force -- go ahead even if the command is stupid. This allows the creation of a swap area larger than the file or partition it resides on. @@ -90,41 +83,46 @@ Without this option, will refuse to erase the first block on a device with a partition table or on a whole disk (e.g. /dev/sda). .TP -.BI \-L \ label +.BR \-L , " \-\-label" \ device-label Specify a label, to allow .B swapon by label. .TP -.BI \-p \ PSZ +.BR \-p , " \-\-pagesize" \ PSZ Specify the page size (in bytes) to use. This option is usually unnecessary, .B mkswap reads the size from the kernel. .TP -.BI \-U \ uuid +.BR \-U , " \-\-uuid" \ uuid Specify the uuid to use. The default is to generate a UUID. .TP -.BR \-v1 -Specify the swap-space version. The old \-v0 option has become obsolete -and now only \-v1 is supported. +.BR \-v , " \-\-swapversion" \ 1 +Specify the swap-space version. The old \-v 0 option has become obsolete +and now only \-v 1 is supported. -The kernel has not supported v0 swap-space format since 2.5.22. -The new version v1 is supported since 2.1.117. +The kernel has not supported v0 swap-space format since 2.5.22 (Jun 2002). +The new version v1 is supported since 2.1.117 (Aug 1998). +.TP +.BR \-V , " \-\-version" +Output version information and exit. +.BR \-h , " \-\-help" +Output help screen and exit. .SH NOTES The maximum useful size of a swap area depends on the architecture and the kernel version. It is roughly 2GiB on i386, PPC, m68k and ARM, 1GiB on sparc, 512MiB on mips, -128GiB on alpha, and 3TiB on sparc64. For kernels after 2.3.3 there is no +128GiB on alpha, and 3TiB on sparc64. For kernels after 2.3.3 (May 1999) there is no such limitation. Note that before version 2.1.117 the kernel allocated one byte for each page, while it now allocates two bytes, so that taking into use a swap area of 2 GiB might require 2 MiB of kernel memory. -Presently, Linux allows 32 swap areas (this was 8 before Linux 2.4.10). +Presently, Linux allows 32 swap areas (this was 8 before Linux 2.4.10 (Sep 2001)). The areas in use can be seen in the file .I /proc/swaps -(since 2.1.25). +(since 2.1.25 (Sep 1997)). .B mkswap refuses areas smaller than 10 pages. -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
