From: Sami Kerola <kerolasa@iki.fi>
Date: Fri, 28 Dec 2012 21:23:42 +0000 (+0000)
Subject: swapon: default to --show if nothing is requested
X-Git-Tag: v2.23-rc1~375
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d96b743f3fc1c5acb21dcfd4cb7d8ee25070b93a;p=thirdparty%2Futil-linux.git

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 29f7a905d9..6efe482961 100644
--- 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);