diff options
| author | Karel Zak | 2014-06-30 11:03:12 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-06-30 11:03:12 +0200 |
| commit | a6c6662d7c3e3849235797374bfa76e07606693b (patch) | |
| tree | 17d779eca4c5aaa70c0a896a95262c5c9a40b525 | |
| parent | swapon: align --summary fields (diff) | |
| download | kernel-qcow2-util-linux-a6c6662d7c3e3849235797374bfa76e07606693b.tar.gz kernel-qcow2-util-linux-a6c6662d7c3e3849235797374bfa76e07606693b.tar.xz kernel-qcow2-util-linux-a6c6662d7c3e3849235797374bfa76e07606693b.zip | |
swapon: mark --sumarry as deprecated
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | Documentation/deprecated.txt | 5 | ||||
| -rw-r--r-- | Documentation/releases/v2.25-ReleaseNotes | 3 | ||||
| -rw-r--r-- | sys-utils/swapon.8 | 3 | ||||
| -rw-r--r-- | sys-utils/swapon.c | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt index db51ac05b..9ca5c2f85 100644 --- a/Documentation/deprecated.txt +++ b/Documentation/deprecated.txt @@ -2,6 +2,11 @@ The following is a list of commands or features that are deprecated. All deprecated utils are in maintenance mode and we keep them in source tree for backward compatibility only. + +what: "swapon --summary" output format +why: does not provide control on output data formatting. The recommended solution + is to use --show=<columns> in all scripts. + what: "pid" as binary name for "kill --pid" why: too ugly, too obscure diff --git a/Documentation/releases/v2.25-ReleaseNotes b/Documentation/releases/v2.25-ReleaseNotes index 3d349c630..46fd788b8 100644 --- a/Documentation/releases/v2.25-ReleaseNotes +++ b/Documentation/releases/v2.25-ReleaseNotes @@ -5,6 +5,9 @@ The command cytune(8) has been REMOVED from util-linux. The non-libmount mount(8) implementation has been REMOVED from util-linux. +The "swapon --summary" output format is deprecated in favor of the +"swapon --show[=<columns>]" that provides better control on output formatting. + Release highlights ------------------ diff --git a/sys-utils/swapon.8 b/sys-utils/swapon.8 index f30dd9bdb..2b9ed0368 100644 --- a/sys-utils/swapon.8 +++ b/sys-utils/swapon.8 @@ -145,7 +145,8 @@ When priority is not defined it defaults to \-1. .TP .B "\-s, \-\-summary" Display swap usage summary by device. Equivalent to "cat /proc/swaps". -Not available before Linux 2.1.25. +Not available before Linux 2.1.25. This output format is DEPRECATED in favour +of \fB\-\-show\fR that provides better control on output data. .TP \fB\-\-show\fR [\fIcolumn\fR, ...] Display definable device table similar to diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 53cd6f951..77af46557 100644 --- a/sys-utils/swapon.c +++ b/sys-utils/swapon.c @@ -683,7 +683,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) " -e, --ifexists silently skip devices that do not exist\n" " -f, --fixpgsz reinitialize the swap space if necessary\n" " -p, --priority <prio> specify the priority of the swap device\n" - " -s, --summary display summary about used swap devices\n" + " -s, --summary display summary about used swap devices (DEPRECATED)\n" " --show[=<columns>] display summary in definable table\n" " --noheadings don't print headings, use with --show\n" " --raw use the raw output format, use with --show\n" |