diff options
| author | Roy Marples <roy@marples.name> | 2009-05-29 14:15:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-29 14:15:12 +0100 |
| commit | 83e82c452e89bf27de2a7b01bc2356c9050b2a18 (patch) | |
| tree | a4f8843c7c02a6b51abb06a16f0a9a6665facc71 /sh/init-common-post.sh.in | |
| parent | 9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff) | |
| parent | a518d34549fd80268e9c70d2300808b63c54825c (diff) | |
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
Diffstat (limited to 'sh/init-common-post.sh.in')
| -rw-r--r-- | sh/init-common-post.sh.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sh/init-common-post.sh.in b/sh/init-common-post.sh.in index 10ec9541..0649cb31 100644 --- a/sh/init-common-post.sh.in +++ b/sh/init-common-post.sh.in @@ -1,10 +1,11 @@ -# Copyright (c) 2007-2008 Roy Marples <roy@marples.name> +# Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # All rights reserved. Released under the 2-clause BSD license. # mount $RC_SVCDIR as something we can write to if it's not rw # On vservers, / is always rw at this point, so we need to clean out # the old service state data -: ${RC_SVCDIR:=/@LIB@/rc/init.d} +: ${RC_LIBEXECDIR:=@LIBEXECDIR@} +: ${RC_SVCDIR:=@LIBEXECDIR@/init.d} case "$(rc --sys)" in OPENVZ|VSERVER) rm -rf "$RC_SVCDIR"/*;; *) if mountinfo --quiet "$RC_SVCDIR"; then @@ -16,8 +17,8 @@ case "$(rc --sys)" in esac retval=$? -if [ -e "$RC_LIBDIR"/cache/deptree ]; then - cp -p "$RC_LIBDIR"/cache/* "$RC_SVCDIR" 2>/dev/null +if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then + cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null fi echo sysinit >"$RC_SVCDIR"/softlevel |