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/rc-functions.sh.in | |
| parent | 9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff) | |
| parent | a518d34549fd80268e9c70d2300808b63c54825c (diff) | |
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
Diffstat (limited to 'sh/rc-functions.sh.in')
| -rw-r--r-- | sh/rc-functions.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in index 6e1ef01f..2a656bc8 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh.in @@ -4,7 +4,7 @@ has_addon() { - [ -e "$RC_LIBDIR/addons/$1.sh" -o -e /@LIB@/rcscripts/addons/"$1".sh ] + [ -e /@LIB@/rc/addons/"$1".sh -o -e /@LIB@/rcscripts/addons/"$1".sh ] } _addon_warn() @@ -17,9 +17,9 @@ _addon_warn() import_addon() { - if [ -e "$RC_LIBDIR/addons/$1.sh" ]; then + if [ -e /@LIB@/rc/addons/"$1".sh ]; then _addon_warn - . "$RC_LIBDIR/addons/$1.sh" + . /@LIB@/rc/addons/"$1".sh elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then _addon_warn . /@LIB@/rcscripts/addons/"$1".sh @@ -86,6 +86,6 @@ get_bootparam() # Add our sbin to $PATH case "$PATH" in - "$RC_LIBDIR"/sbin|"$RC_LIBDIR"/sbin:*);; - *) export PATH="$RC_LIBDIR/sbin:$PATH";; + "$RC_LIBEXECDIR"/sbin|"$RC_LIBEXECDIR"/sbin:*);; + *) export PATH="$RC_LIBEXECDIR/sbin:$PATH";; esac |