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 1SNSyf-00027C-Vk for garchives@archives.gentoo.org; Thu, 26 Apr 2012 17:59:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 295BCE06D7; Thu, 26 Apr 2012 17:59:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EB702E06D7 for ; Thu, 26 Apr 2012 17:59:29 +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 61BFA1B4030 for ; Thu, 26 Apr 2012 17:59:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2A381E5402 for ; Thu, 26 Apr 2012 17:59:28 +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: <1335463004.8c82637e76dcc6a076bdc5e17c142ec8999364a1.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/gendepends.sh.in sh/runscript.sh.in X-VCS-Directories: sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8c82637e76dcc6a076bdc5e17c142ec8999364a1 X-VCS-Branch: master Date: Thu, 26 Apr 2012 17:59:28 +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: 5eee657c-dfcb-47da-8d0d-49b2471b2a86 X-Archives-Hash: 64fd288862f4d659038d224fc3f9e80d commit: 8c82637e76dcc6a076bdc5e17c142ec8999364a1 Author: William Hubbs gentoo org> AuthorDate: Thu Apr 26 17:56:44 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Apr 26 17:56:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D8c82637e fix references to functions.sh There were a couple of places where we were sourcing functions.sh in @SYSCONFDIR /init.d. This is only a backward compatibility symlink, = so it should not be used for openrc. The correct place to source this from is @LIBEXECDIR@/sh. --- sh/gendepends.sh.in | 2 +- sh/runscript.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in index 8858bac..8dab3c2 100644 --- a/sh/gendepends.sh.in +++ b/sh/gendepends.sh.in @@ -4,7 +4,7 @@ # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. =20 -. @SYSCONFDIR@/init.d/functions.sh +. @LIBEXECDIR@/sh/functions.sh . @LIBEXECDIR@/sh/rc-functions.sh =20 config() { diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index bc93b51..6ad2ded 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -32,7 +32,7 @@ sourcex() fi } =20 -sourcex "@SYSCONFDIR@/init.d/functions.sh" +sourcex "@LIBEXECDIR@/sh/functions.sh" sourcex "@LIBEXECDIR@/sh/rc-functions.sh" =20 # Support LiveCD foo