swapon: default to --show if nothing is requested

Proposed-by: Karel Zak <kzak@redhat.com>
References: http://www.spinics.net/lists/util-linux-ng/msg07301.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 29f7a905d9eabd7377909901133159dcfdb3e6b9..6efe482961e27e2c92b549bbc6991b9407f7839c 100644 (file)
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -782,7 +782,7 @@ int main(int argc, char *argv[])
        }
        argv += optind;
 
-       if (show) {
+       if (show || (!all && !numof_labels() && !numof_uuids() && *argv == NULL)) {
                if (!ncolumns) {
                        /* default columns */
                        columns[ncolumns++] = COL_PATH;
@@ -795,9 +795,6 @@ int main(int argc, char *argv[])
                return status;
        }
 
-       if (!all && !numof_labels() && !numof_uuids() && *argv == NULL)
-               usage(stderr);
-
        if (ifexists && !all)
                usage(stderr);