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 D57C359CB2 for ; Fri, 15 Apr 2016 16:40:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ADCEE086E; Fri, 15 Apr 2016 16:40:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15263E086E for ; Fri, 15 Apr 2016 16:40:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F0DA340C90 for ; Fri, 15 Apr 2016 16:40:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA7EB188 for ; Fri, 15 Apr 2016 16:40:15 +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: <1460737844.1c3c2cf6d8cb060d03919297f5fe706f6027a4c6.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/netmount.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 1c3c2cf6d8cb060d03919297f5fe706f6027a4c6 X-VCS-Branch: master Date: Fri, 15 Apr 2016 16:40:15 +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: eecf0df5-4ebb-4a54-8d0e-1640aefceef7 X-Archives-Hash: 942eb77e406e8c0406b0899d9f056175 commit: 1c3c2cf6d8cb060d03919297f5fe706f6027a4c6 Author: William Hubbs gmail com> AuthorDate: Fri Apr 15 16:30:44 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Apr 15 16:30:44 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1c3c2cf6 netmount: fix mounting on Linux Before this commit, on Linux, we were always trying to mount file systems marked with _netdev, even when the previous mount command failed. Now, we do not run the second mount if the first fails. X-Gentoo-Bug: 579876 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=579876 init.d/netmount.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.d/netmount.in b/init.d/netmount.in index 0acf15e..f7237f1 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -37,7 +37,7 @@ start() ebegin "Mounting network filesystems" mount -at $fs rc=$? - if [ "$RC_UNAME" = Linux ]; then + if [ "$RC_UNAME" = Linux ] && [ $rc = 0 ]; then mount -a -O _netdev rc=$? fi @@ -72,7 +72,7 @@ stop() retval=$? eoutdent - if [ "$RC_UNAME" = Linux ]; then + if [ "$RC_UNAME" = Linux ] && [ $retval = 0 ]; then umount -a -O _netdev retval=$? fi