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 1SNSFR-0000Ir-Bn for garchives@archives.gentoo.org; Thu, 26 Apr 2012 17:12:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23D35E0795; Thu, 26 Apr 2012 17:12:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ED498E0795 for ; Thu, 26 Apr 2012 17:12:45 +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 3759F1B4027 for ; Thu, 26 Apr 2012 17:12:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ECD35E5402 for ; Thu, 26 Apr 2012 17:12:43 +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: <1335460318.3967077da3901b4f10d71dec1ee977af36fae956.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: 3967077da3901b4f10d71dec1ee977af36fae956 X-VCS-Branch: master Date: Thu, 26 Apr 2012 17:12:43 +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: 071c6905-ce73-42df-950f-bb028ea51762 X-Archives-Hash: b999fab2fe38e1f865e3f1abb7ccb936 commit: 3967077da3901b4f10d71dec1ee977af36fae956 Author: William Hubbs gentoo org> AuthorDate: Thu Apr 26 17:11:58 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Apr 26 17:11:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D3967077d Revert "Revert "Let runscript enter the service dir before expand globs"" This reverts commit f971c4c0b5e45500f1255f2e076f2c101d2f9281. After further discussion, this is a good first step toward a fix, so I am putting it back. --- sh/runscript.sh.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index 15cdb86..a4d9e7c 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -174,6 +174,10 @@ 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%%.*}