diff options
| author | William Hubbs <williamh@gentoo.org> | 2012-04-26 12:56:44 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2012-04-26 12:56:44 -0500 |
| commit | 8c82637e76dcc6a076bdc5e17c142ec8999364a1 (patch) | |
| tree | 68b96a9d8f12957aedc29a28ed5a746f85f1cb57 | |
| parent | 8d63719418de14248bb4bd3b4a0ce5599f8f3092 (diff) | |
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.
| -rw-r--r-- | sh/gendepends.sh.in | 2 | ||||
| -rw-r--r-- | 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 <roy@marples.name> # 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 |