swapon: mark --sumarry as deprecated

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt
index db51ac05b29b2487f55ac5da52ea14f12fdd8e01..9ca5c2f856a19a286265aab6997869f3d9cc8ccb 100644 (file)
--- 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 3d349c6306c8845f28c13b6af517fd4045704d80..46fd788b8365a0cea5226d14678a8b9fb4cce5af 100644 (file)
--- 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 f30dd9bdbe58cecbfe66558f2d402584cae25fa1..2b9ed03687a6be4f6ba47e82598c6a4522f116c8 100644 (file)
--- 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 53cd6f9515a0c3fe7385586cace5da9a659b1236..77af4655773ff577177eb109585ae1020547e35d 100644 (file)
--- 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"