[git commit] swapon/swapoff: -a returns 0 on ignored errors

Denys Vlasenko vda.linux at googlemail.com
Tue Apr 1 07:51:27 UTC 2014


commit: http://git.busybox.net/busybox/commit/?id=c9a67133d6a947532b560c7f2b9391ec299dd97f
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Tito Ragusa <farmatito at tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/swaponoff.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index acdb677..7548726 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -116,9 +116,8 @@ static int swap_enable_disable(char *device)
 		}
 	}
 
-	if (err) {
-		if (!quiet)
-			bb_simple_perror_msg(device);
+	if (err && !quiet) {
+		bb_simple_perror_msg(device);
 		return 1;
 	}
 	return 0;


More information about the busybox-cvs mailing list