wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-30 12:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename FINIT_LIBPATH_ -> FINIT_EXECPATH_

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-02-28 00:48:25 +01:00
1 parent a69cef0a11
commit 966ae9fb0d
3 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configure.ac
+1 -1
View File
@@ -275,7 +275,7 @@ AM_CONDITIONAL(TESTSERV, [test "x$enable_testserv_plugin" = "xyes"])
pkglibdir=$libdir/finit pkglibdir=$libdir/finit
AC_SUBST(pkglibexecdir) AC_SUBST(pkglibexecdir)
AC_EXPAND_DIR(pkglibexecdir, "$libexecdir/finit") AC_EXPAND_DIR(pkglibexecdir, "$libexecdir/finit")
AC_DEFINE_UNQUOTED(FINIT_LIBPATH_, "$pkglibexecdir", [Finit libexec path]) AC_DEFINE_UNQUOTED(FINIT_EXECPATH_, "$pkglibexecdir", [Finit libexec path])
AC_EXPAND_DIR(plugin_path, "$libdir/finit/plugins") AC_EXPAND_DIR(plugin_path, "$libdir/finit/plugins")
AC_SUBST(plugin_path) AC_SUBST(plugin_path)
src/conf.c
+4 -4
View File
@@ -1219,16 +1219,16 @@ int conf_init(uev_ctx_t *ctx)
* Start built-in watchdogd as soon as possible, if enabled * Start built-in watchdogd as soon as possible, if enabled
*/ */
#ifdef WDT_DEVNODE #ifdef WDT_DEVNODE
if (whichp(FINIT_LIBPATH_ "/watchdogd") && fexist(WDT_DEVNODE)) { if (whichp(FINIT_EXECPATH_ "/watchdogd") && fexist(WDT_DEVNODE)) {
service_register(SVC_TYPE_SERVICE, "[S123456789] cgroup.init name:watchdog :finit " FINIT_LIBPATH_ "/watchdogd -- Finit watchdog daemon", global_rlimit, NULL); service_register(SVC_TYPE_SERVICE, "[S123456789] cgroup.init name:watchdog :finit " FINIT_EXECPATH_ "/watchdogd -- Finit watchdog daemon", global_rlimit, NULL);
wdog = svc_find("watchdog", "finit"); wdog = svc_find("watchdog", "finit");
} }
#endif #endif
/* /*
* Start kernel event daemon as soon as possible, if enabled * Start kernel event daemon as soon as possible, if enabled
*/ */
if (whichp(FINIT_LIBPATH_ "/keventd")) if (whichp(FINIT_EXECPATH_ "/keventd"))
service_register(SVC_TYPE_SERVICE, "[S123456789] cgroup.init " FINIT_LIBPATH_ "/keventd -- Finit kernel event daemon", global_rlimit, NULL); service_register(SVC_TYPE_SERVICE, "[S123456789] cgroup.init " FINIT_EXECPATH_ "/keventd -- Finit kernel event daemon", global_rlimit, NULL);
dbg("Allow plugins to register early runlevel 1 run/task/services ..."); dbg("Allow plugins to register early runlevel 1 run/task/services ...");
plugin_run_hooks(HOOK_SVC_PLUGIN); plugin_run_hooks(HOOK_SVC_PLUGIN);
src/finit.h
+4 -4
View File
@@ -54,10 +54,10 @@
#define FINIT_CGPATH "/sys/fs/cgroup" #define FINIT_CGPATH "/sys/fs/cgroup"
#endif #endif
/* To use these, include config.h, or define FINIT_LIBPATH_ */ /* To use these, include config.h, or define FINIT_EXECPATH_ */
#define _PATH_LOGIT FINIT_LIBPATH_ "/logit" #define _PATH_LOGIT FINIT_EXECPATH_ "/logit"
#define _PATH_SULOGIN FINIT_LIBPATH_ "/sulogin" #define _PATH_SULOGIN FINIT_EXECPATH_ "/sulogin"
#define _PATH_GETTY FINIT_LIBPATH_ "/getty" #define _PATH_GETTY FINIT_EXECPATH_ "/getty"
#define CMD_SIZE 256 #define CMD_SIZE 256
#define LINE_SIZE 1024 #define LINE_SIZE 1024