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 /src/rc/rc-misc.c | |
| 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 'src/rc/rc-misc.c')
| -rw-r--r-- | src/rc/rc-misc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c index 1cc3dd4..0239f9d 100644 --- a/src/rc/rc-misc.c +++ b/src/rc/rc-misc.c @@ -50,14 +50,15 @@ #include "einfo.h" #include "rc.h" #include "rc-misc.h" +#include "version.h" #define PROFILE_ENV RC_SYSCONFDIR "/profile.env" -#define SYS_WHITELIST RC_LIBDIR "/conf.d/env_whitelist" +#define SYS_WHITELIST RC_LIBEXECDIR "/conf.d/env_whitelist" #define USR_WHITELIST RC_SYSCONFDIR "/conf.d/env_whitelist" #define RC_CONF RC_SYSCONFDIR "/rc.conf" #define RC_CONF_OLD RC_SYSCONFDIR "/conf.d/rc" -#define PATH_PREFIX RC_LIBDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin" +#define PATH_PREFIX RC_LIBEXECDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin" static RC_STRINGLIST *rc_conf = NULL; @@ -221,7 +222,8 @@ env_config(void) free(e); } - setenv("RC_LIBDIR", RC_LIBDIR, 1); + setenv("RC_VERSION", VERSION, 1); + setenv("RC_LIBEXECDIR", RC_LIBEXECDIR, 1); setenv("RC_SVCDIR", RC_SVCDIR, 1); setenv("RC_TMPDIR", RC_SVCDIR "/tmp", 1); setenv("RC_BOOTLEVEL", RC_LEVEL_BOOT, 1); |