commit:     1c3c2cf6d8cb060d03919297f5fe706f6027a4c6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Apr 15 16:30:44 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> 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

Reply via email to