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

Introduce LOCAL_PREFIX for a user maintained script location.

Browse Source
This commit is contained in:
Roy Marples
2008-03-03 10:33:42 +00:00
parent 5971d14afd
commit 0aedc02860
7 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,14 @@
* /usr/pkg. */
#ifdef PKG_PREFIX
# define RC_PKG_INITDIR PKG_PREFIX "/etc/init.d"
# define RC_PKG_CONFDIR PKG_PREFIX "/usr/local/etc/conf.d"
# define RC_PKG_CONFDIR PKG_PREFIX "/etc/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"
#endif
#define RC_KSOFTLEVEL RC_SVCDIR "/ksoftlevel"

6
src/librc/librc-depend.c
View File

@@ -701,6 +701,12 @@ bool rc_deptree_update_needed (void)
#endif
#ifdef RC_PKG_CONFDIR
! rc_newer_than (RC_DEPTREE, RC_PKG_CONFDIR) ||
#endif
#ifdef RC_LOCAL_INITDIR
! rc_newer_than (RC_DEPTREE, RC_LOCAL_INITDIR) ||
#endif
#ifdef RC_LOCAL_CONFDIR
! rc_newer_than (RC_DEPTREE, RC_LOCAL_CONFDIR) ||
#endif
! rc_newer_than (RC_DEPTREE, "/etc/rc.conf"))
return (true);

26
src/librc/librc.c
View File

@@ -313,6 +313,7 @@ char *rc_service_resolve (const char *service)
if (service[0] == '/')
return (xstrdup (service));
/* First check started services */
file = rc_strcatpaths (RC_SVCDIR, "started", service, (char *) NULL);
if (lstat (file, &buf) || ! S_ISLNK (buf.st_mode)) {
free (file);
@@ -324,6 +325,14 @@ char *rc_service_resolve (const char *service)
}
memset (buffer, 0, sizeof (buffer));
/* Nope, so lets see if the user has written it */
#ifdef RC_LOCAL_INITDIR
snprintf (buffer, sizeof (buffer), RC_LOCAL_INITDIR "/%s", service);
if (stat (buffer, &buf) == 0)
return (xstrdup (buffer));
#endif
if (file) {
r = readlink (file, buffer, sizeof (buffer));
free (file);
@@ -332,7 +341,7 @@ char *rc_service_resolve (const char *service)
}
snprintf (buffer, sizeof (buffer), RC_INITDIR "/%s", service);
/* So we don't exist in /etc/init.d - check /usr/local/etc/init.d */
/* So we don't exist in /etc/init.d - check RC_PKG_INITDIR */
#ifdef RC_PKG_INITDIR
if (stat (buffer, &buf) != 0) {
snprintf (buffer, sizeof (buffer), RC_PKG_INITDIR "/%s", service);
@@ -787,19 +796,28 @@ char **rc_services_in_runlevel (const char *runlevel)
char **list = NULL;
if (! runlevel) {
#ifdef RC_PKG_INITDIR
#if defined(RC_PKG_INITDIR) || defined(RC_LOCAL_INITDIR)
int i;
char **local = ls_dir (RC_PKG_INITDIR, LS_INITD);
#endif
#ifdef RC_PKG_INITDIR
char **pkg = ls_dir (RC_PKG_INITDIR, LS_INITD);
#endif
#ifdef RC_LOCAL_INITDIR
char **local = ls_dir (RC_LOCAL_INITDIR, LS_INITD);
#endif
list = ls_dir (RC_INITDIR, LS_INITD);
#ifdef RC_PKG_INITDIR
STRLIST_FOREACH (pkg, dir, i)
rc_strlist_addsortu (&list, dir);
rc_strlist_free (pkg);
#endif
#ifdef RC_LOCAL_DIR
STRLIST_FOREACH (local, dir, i)
rc_strlist_addsortu (&list, dir);
rc_strlist_free (local);
#endif
return (list);
}