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 0E2F41397F2 for ; Fri, 21 Aug 2015 17:23:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89276E083B; Fri, 21 Aug 2015 17:23:24 +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 2DF8EE083B for ; Fri, 21 Aug 2015 17:23:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00D013409D7 for ; Fri, 21 Aug 2015 17:23:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0056129 for ; Fri, 21 Aug 2015 17:23:19 +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: <1440177691.b652752339690e10a55ae50d046f4cf2a98daf1a.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/localmount.in init.d/netmount.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: b652752339690e10a55ae50d046f4cf2a98daf1a X-VCS-Branch: master Date: Fri, 21 Aug 2015 17:23:19 +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: 4b2d9860-34fc-451d-b8a6-64114c22b01a X-Archives-Hash: 5fdad064cc07372f2ed717e630d6ebc0 commit: b652752339690e10a55ae50d046f4cf2a98daf1a Author: William Hubbs gmail com> AuthorDate: Fri Aug 21 00:01:23 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Aug 21 17:21:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b6527523 Make localmount and netmount always succeed on non-linux init.d/localmount.in | 9 ++++++++- init.d/netmount.in | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/init.d/localmount.in b/init.d/localmount.in index 9d05ebc..7b94790 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -15,7 +15,7 @@ depend() start() { # Mount local filesystems in /etc/fstab. - local types="noproc" x= + local types="noproc" x= rc= for x in $net_fs_list $extra_net_fs_list; do types="${types},no${x}" done @@ -28,6 +28,13 @@ start() ebegin "Mounting local filesystems" mount -at "$types" eend $? "Some local filesystem failed to mount" + rc=$? + if [ "$RC_UNAME" != Linux ]; then + rc=0 + elif [ "$rc" = 64 ]; then + rc=0 + fi + return $rc } stop() diff --git a/init.d/netmount.in b/init.d/netmount.in index 99db185..9f8537d 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -23,6 +23,12 @@ start() mount -at $fs rc=$? ewend $rc "Could not mount all network filesystems" + if [ "$RC_UNAME" != Linux ]; then + rc=0 + elif [ "$rc" = 64 ]; then + rc=0 + fi + return $rc } stop()