From 8c82637e76dcc6a076bdc5e17c142ec8999364a1 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 26 Apr 2012 12:56:44 -0500 Subject: 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 8858bacd..8dab3c2b 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. -. @SYSCONFDIR@/init.d/functions.sh +. @LIBEXECDIR@/sh/functions.sh . @LIBEXECDIR@/sh/rc-functions.sh config() { diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index bc93b511..6ad2ded3 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -32,7 +32,7 @@ sourcex() fi } -sourcex "@SYSCONFDIR@/init.d/functions.sh" +sourcex "@LIBEXECDIR@/sh/functions.sh" sourcex "@LIBEXECDIR@/sh/rc-functions.sh" # Support LiveCD foo -- cgit v1.2.3