diff options
| author | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
| commit | c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc (patch) | |
| tree | fe1f406f976dbcec3d7225ccf1b0f08f6957dfcc /sh/rc-functions.sh.in | |
| parent | 5294abe6171610a1aa0eb093774bed9bb965c9cf (diff) | |
| download | openrc-c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc.tar.gz openrc-c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc.tar.bz2 openrc-c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc.tar.xz | |
Move non compiled libraries from /lib/rc to /libexec/rc
OpenRC version is now stored as plaintext in /libexec/rc/version
Plugins (cursplash, splashutils) will have to be re-compiled to pickup
the new directories. State data needs to be moved from /lib/rc/init.d
to /libexec/rc/init.d as well.
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 6e1ef01..2a656bc 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 |