emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tunable SYSCONFDIR

Browse Source
This commit is contained in:
Roy Marples
2008-03-05 12:27:11 +00:00
parent 7aa231de2e
commit a689b66023
34 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/includes/rc-misc.h
View File

@@ -41,6 +41,10 @@
# define LIB "lib"
#endif
#ifndef SYSCONFDIR
# define SYSCONFDIR "/etc"
#endif
#ifdef PREFIX
# define RC_PREFIX PREFIX
#else
@@ -53,23 +57,23 @@
#define RC_LIBDIR RC_PREFIX "/" LIB "/rc"
#define RC_SVCDIR RC_LIBDIR "/init.d"
#define RC_DEPTREE RC_SVCDIR "/deptree"
#define RC_RUNLEVELDIR RC_PREFIX "/etc/runlevels"
#define RC_INITDIR RC_PREFIX "/etc/init.d"
#define RC_CONFDIR RC_PREFIX "/etc/conf.d"
#define RC_RUNLEVELDIR RC_PREFIX SYSCONFDIR "/runlevels"
#define RC_INITDIR RC_PREFIX SYSCONFDIR "/init.d"
#define RC_CONFDIR RC_PREFIX SYSCONFDIR "/conf.d"
/* PKG_PREFIX is where packages are installed if different from the base OS
* On Gentoo this is normally unset, on FreeBSD /usr/local and on NetBSD
* /usr/pkg. */
#ifdef PKG_PREFIX
# define RC_PKG_INITDIR PKG_PREFIX "/etc/init.d"
# define RC_PKG_CONFDIR PKG_PREFIX "/etc/conf.d"
# define RC_PKG_INITDIR PKG_PREFIX SYSCONFDIR "/init.d"
# define RC_PKG_CONFDIR PKG_PREFIX SYSCONFDIR "/conf.d"
#endif
/* LOCAL_PREFIX is for user written stuff, which the base OS and package
* manger don't touch. */
#ifdef LOCAL_PREFIX
# define RC_LOCAL_INITDIR LOCAL_PREFIX "/etc/init.d"
# define RC_LOCAL_CONFDIR LOCAL_PREFIX "/etc/conf.d"
# define RC_LOCAL_INITDIR LOCAL_PREFIX SYSCONFDIR "/init.d"
# define RC_LOCAL_CONFDIR LOCAL_PREFIX SYSCONFDIR "/conf.d"
#endif
#define RC_KSOFTLEVEL RC_SVCDIR "/ksoftlevel"

1
src/librc/Makefile
View File

@@ -9,6 +9,7 @@ INCS= rc.h
VERSION_MAP= rc.map
CFLAGS+= -DLIB=\"${LIBNAME}\"
CFLAGS+= -DSYSCONFDIR=\"${SYSCONFDIR}\"
LDADD+= ${LIBKVM}
CFLAGS+= -I../includes

1
src/rc/Makefile
View File

@@ -40,6 +40,7 @@ include ${MK}/prog.mk
CFLAGS+= -I../includes -I../librc -I../libeinfo
CFLAGS+= -DLIB=\"${LIBNAME}\"
CFLAGS+= -DSYSCONFDIR=\"${SYSCONFDIR}\"
include ${MK}/${MKTERMCAP}.mk
LDADD+= ${LIBDL} ${LIBKVM}

8
src/rc/rc-misc.c
View File

@@ -49,11 +49,11 @@
#include "rc-misc.h"
#include "strlist.h"
#define PROFILE_ENV "/etc/profile.env"
#define PROFILE_ENV SYSCONFDIR "/profile.env"
#define SYS_WHITELIST RC_LIBDIR "/conf.d/env_whitelist"
#define USR_WHITELIST "/etc/conf.d/env_whitelist"
#define RC_CONF "/etc/rc.conf"
#define RC_CONF_OLD "/etc/conf.d/rc"
#define USR_WHITELIST SYSCONFDIR "/conf.d/env_whitelist"
#define RC_CONF SYSCONFDIR "/rc.conf"
#define RC_CONF_OLD SYSCONFDIR "/conf.d/rc"
#define PATH_PREFIX RC_LIBDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin"