From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 24236138247 for ; Sat, 18 Jan 2014 20:02:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B460FE0D38; Sat, 18 Jan 2014 20:02:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5780AE0D38 for ; Sat, 18 Jan 2014 20:02:34 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 763D133F8EE for ; Sat, 18 Jan 2014 20:02:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B5F5A18096 for ; Sat, 18 Jan 2014 20:02:31 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1390074605.de186401e5843e376cc12545c2ea35212f5e0490.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/fstabinfo.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: de186401e5843e376cc12545c2ea35212f5e0490 X-VCS-Branch: master Date: Sat, 18 Jan 2014 20:02:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1dd4485b-2dec-46b2-b33a-282535e92382 X-Archives-Hash: 4b7c7e1cbaa4866ed679fa4decd038ee commit: de186401e5843e376cc12545c2ea35212f5e0490 Author: William Hubbs gmail com> AuthorDate: Sat Jan 18 19:50:05 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Jan 18 19:50:05 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=de186401 fstabinfo: fix mount and remount The mount and remount options should always be processed. They were only being processed if -q was not on the command line. X-Gentoo-Bug: 498206 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=498206 --- src/rc/fstabinfo.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/rc/fstabinfo.c b/src/rc/fstabinfo.c index 475212a..99eb7bc 100644 --- a/src/rc/fstabinfo.c +++ b/src/rc/fstabinfo.c @@ -298,15 +298,8 @@ fstabinfo(int argc, char **argv) continue; } - /* No point in outputting if quiet */ - if (rc_yesno(getenv("EINFO_QUIET"))) - continue; - + /* mount or remount? */ switch (output) { - case OUTPUT_BLOCKDEV: - printf("%s\n", ENT_BLOCKDEVICE(ent)); - break; - case OUTPUT_MOUNT: result += do_mount(ent, false); break; @@ -314,6 +307,16 @@ fstabinfo(int argc, char **argv) case OUTPUT_REMOUNT: result += do_mount(ent, true); break; + } + + /* No point in outputting if quiet */ + if (rc_yesno(getenv("EINFO_QUIET"))) + continue; + + switch (output) { + case OUTPUT_BLOCKDEV: + printf("%s\n", ENT_BLOCKDEVICE(ent)); + break; case OUTPUT_MOUNTARGS: printf("-o %s -t %s %s %s\n",