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

Try and fix more prefix stuff.

Browse Source
This commit is contained in:
Roy Marples 2008-03-25 18:33:45 +00:00
parent 068c90c82b
commit 5866d829bb
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.d/rc-enabled.in
View File

@ -24,9 +24,7 @@ start()
done done
# If we have an init script for this service, continue # If we have an init script for this service, continue
[ -x @SYSCONFDIR@/init.d/"${service}" ] && continue rc-service --list | grep -q "${service}" && continue
[ -x @PKG_PREFIX@/@SYSCONFDIR@/init.d/"${service}" ] && continue
[ -x @LOCAL_PREFIX@/@SYSCONFDIR@/init.d/"${service}" ] && continue
# Ensure that the users rc.conf will start us - ignore the defaults # Ensure that the users rc.conf will start us - ignore the defaults
eval enabled=\$${svc##*/}_enable eval enabled=\$${svc##*/}_enable

10
sh/gendepends.sh.in
View File

@ -4,7 +4,7 @@
# Copyright 2007-2008 Roy Marples <roy@marples.name> # Copyright 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license. # All rights reserved. Released under the 2-clause BSD license.
. @PREFIX@/@SYSCONFDIR@/init.d/functions.sh . @SYSCONFDIR@/init.d/functions.sh
config() { config() {
[ -n "$*" ] && echo "${RC_SVCNAME} config $*" >&3 [ -n "$*" ] && echo "${RC_SVCNAME} config $*" >&3
@ -33,9 +33,9 @@ depend() {
_done_dirs= _done_dirs=
for _dir in \ for _dir in \
@PREFIX@/@SYSCONFDIR@/init.d \ @SYSCONFDIR@/init.d \
@PKG_PREFIX@/@SYSCONFDIR@/init.d \ @PKG_PREFIX@/etc/init.d \
@LOCAL_PREFIX@/@SYSCONFDIR@/init.d @LOCAL_PREFIX@/etc/init.d
do do
[ -d "${_dir}" ] || continue [ -d "${_dir}" ] || continue
@ -76,7 +76,7 @@ do
. "${_dir}/../conf.d/${RC_SVCNAME}" . "${_dir}/../conf.d/${RC_SVCNAME}"
fi fi
[ -e @PREFIX@/@SYSCONFDIR@/rc.conf ] && . @PREFIX@/@SYSCONFDIR@/rc.conf [ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
if . "${_dir}/${RC_SVCNAME}"; then if . "${_dir}/${RC_SVCNAME}"; then
echo "${RC_SVCNAME}" >&3 echo "${RC_SVCNAME}" >&3

4
sh/runscript.sh.in
View File

@ -4,7 +4,7 @@
# Copyright 2007-2008 Roy Marples <roy@marples.name> # Copyright 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license. # All rights reserved. Released under the 2-clause BSD license.
. @PREFIX@/@SYSCONFDIR@/init.d/functions.sh . @SYSCONFDIR@/init.d/functions.sh
. "${RC_LIBDIR}"/sh/rc-functions.sh . "${RC_LIBDIR}"/sh/rc-functions.sh
# Support LiveCD foo # Support LiveCD foo
@ -67,7 +67,7 @@ fi
unset _conf_d unset _conf_d
# Load any system overrides # Load any system overrides
[ -e @PREFIX@/@SYSCONFDIR@/rc.conf ] && . @PREFIX@/@SYSCONFDIR@/rc.conf [ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
# Apply any ulimit defined # Apply any ulimit defined
[ -n "${rc_ulimit:-${RC_ULIMIT}}" ] && ulimit ${rc_ulimit:-${RC_ULIMIT}} [ -n "${rc_ulimit:-${RC_ULIMIT}}" ] && ulimit ${rc_ulimit:-${RC_ULIMIT}}

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

@ -41,39 +41,39 @@
# define LIB "lib" # define LIB "lib"
#endif #endif
#ifndef SYSCONFDIR
# define SYSCONFDIR "/etc"
#endif
#ifdef PREFIX #ifdef PREFIX
# define RC_PREFIX PREFIX # define RC_PREFIX PREFIX
#else #else
# define RC_PREFIX # define RC_PREFIX
#endif #endif
#ifndef SYSCONFDIR
# define SYSCONFDIR RC_PREFIX "/etc"
#endif
#define RC_LEVEL_BOOT "boot" #define RC_LEVEL_BOOT "boot"
#define RC_LEVEL_DEFAULT "default" #define RC_LEVEL_DEFAULT "default"
#define RC_LIBDIR RC_PREFIX "/" LIB "/rc" #define RC_LIBDIR RC_PREFIX "/" LIB "/rc"
#define RC_SVCDIR RC_LIBDIR "/init.d" #define RC_SVCDIR RC_LIBDIR "/init.d"
#define RC_DEPTREE_CACHE RC_SVCDIR "/deptree" #define RC_DEPTREE_CACHE RC_SVCDIR "/deptree"
#define RC_RUNLEVELDIR RC_PREFIX SYSCONFDIR "/runlevels" #define RC_RUNLEVELDIR SYSCONFDIR "/runlevels"
#define RC_INITDIR RC_PREFIX SYSCONFDIR "/init.d" #define RC_INITDIR SYSCONFDIR "/init.d"
#define RC_CONFDIR RC_PREFIX SYSCONFDIR "/conf.d" #define RC_CONFDIR SYSCONFDIR "/conf.d"
/* PKG_PREFIX is where packages are installed if different from the base OS /* 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 * On Gentoo this is normally unset, on FreeBSD /usr/local and on NetBSD
* /usr/pkg. */ * /usr/pkg. */
#ifdef PKG_PREFIX #ifdef PKG_PREFIX
# define RC_PKG_INITDIR PKG_PREFIX SYSCONFDIR "/init.d" # define RC_PKG_INITDIR PKG_PREFIX "/etc/init.d"
# define RC_PKG_CONFDIR PKG_PREFIX SYSCONFDIR "/conf.d" # define RC_PKG_CONFDIR PKG_PREFIX "/etc/conf.d"
#endif #endif
/* LOCAL_PREFIX is for user written stuff, which the base OS and package /* LOCAL_PREFIX is for user written stuff, which the base OS and package
* manger don't touch. */ * manger don't touch. */
#ifdef LOCAL_PREFIX #ifdef LOCAL_PREFIX
# define RC_LOCAL_INITDIR LOCAL_PREFIX SYSCONFDIR "/init.d" # define RC_LOCAL_INITDIR LOCAL_PREFIX "/etc/init.d"
# define RC_LOCAL_CONFDIR LOCAL_PREFIX SYSCONFDIR "/conf.d" # define RC_LOCAL_CONFDIR LOCAL_PREFIX "/etc/conf.d"
#endif #endif
#define RC_KRUNLEVEL RC_SVCDIR "/krunlevel" #define RC_KRUNLEVEL RC_SVCDIR "/krunlevel"