From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SNSO2-0001Ex-JU for garchives@archives.gentoo.org; Thu, 26 Apr 2012 17:21:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7872E0795; Thu, 26 Apr 2012 17:21:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7986EE0795 for ; Thu, 26 Apr 2012 17:21:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE56D1B402E for ; Thu, 26 Apr 2012 17:21:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9B1DFE5402 for ; Thu, 26 Apr 2012 17:21:37 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1335460782.8d63719418de14248bb4bd3b4a0ce5599f8f3092.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/runscript.sh.in X-VCS-Directories: sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8d63719418de14248bb4bd3b4a0ce5599f8f3092 X-VCS-Branch: master Date: Thu, 26 Apr 2012 17:21:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b1a1b529-57a0-48ba-9cb4-00155a010ffa X-Archives-Hash: a572ac42573b54249027bc061951b459 commit: 8d63719418de14248bb4bd3b4a0ce5599f8f3092 Author: William Hubbs gentoo org> AuthorDate: Thu Apr 26 17:19:42 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Apr 26 17:19:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D8d637194 Change the working directory for depend only We already have a special case for depend processing, so we should change the working directory there only. This prevents us from forcing all init scripts to be run in the init directory. --- sh/runscript.sh.in | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index a4d9e7c..bc93b51 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -174,10 +174,6 @@ status() =20 yesno $RC_DEBUG && set -x =20 -# Enter the dir of the init script to fix the globbing with e.g. depend(= ) -# bug 412677 -cd ${RC_SERVICE%/*} - _conf_d=3D${RC_SERVICE%/*}/../conf.d # If we're net.eth0 or openvpn.work then load net or openvpn config _c=3D${RC_SVCNAME%%.*} @@ -237,7 +233,12 @@ while [ -n "$1" ]; do # Special case depend if [ "$1" =3D depend ]; then shift + + # Enter the dir of the init script to fix the globbing + # bug 412677 + cd ${RC_SERVICE%/*} _depend + cd / continue fi # See if we have the required function and run it