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 /src/rc/rc-misc.c | |
parent | 9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff) | |
parent | a518d34549fd80268e9c70d2300808b63c54825c (diff) |
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
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 1cc3dd41..0239f9d4 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); |