From 966ae9fb0d28babbaebee9a34cccfa8ba7dfe58f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 24 Feb 2023 19:36:12 +0100 Subject: [PATCH] Rename FINIT_LIBPATH_ -> FINIT_EXECPATH_ Signed-off-by: Joachim Wiberg --- configure.ac | 2 +- src/conf.c | 8 ++++---- src/finit.h | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 89d12eb7..817146ca 100644 --- a/configure.ac +++ b/configure.ac @@ -275,7 +275,7 @@ AM_CONDITIONAL(TESTSERV, [test "x$enable_testserv_plugin" = "xyes"]) pkglibdir=$libdir/finit AC_SUBST(pkglibexecdir) 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_SUBST(plugin_path) diff --git a/src/conf.c b/src/conf.c index 1ac5af20..a8ce00f4 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1219,16 +1219,16 @@ int conf_init(uev_ctx_t *ctx) * Start built-in watchdogd as soon as possible, if enabled */ #ifdef WDT_DEVNODE - if (whichp(FINIT_LIBPATH_ "/watchdogd") && fexist(WDT_DEVNODE)) { - service_register(SVC_TYPE_SERVICE, "[S123456789] cgroup.init name:watchdog :finit " FINIT_LIBPATH_ "/watchdogd -- Finit watchdog daemon", global_rlimit, NULL); + if (whichp(FINIT_EXECPATH_ "/watchdogd") && fexist(WDT_DEVNODE)) { + 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"); } #endif /* * Start kernel event daemon as soon as possible, if enabled */ - if (whichp(FINIT_LIBPATH_ "/keventd")) - service_register(SVC_TYPE_SERVICE, "[S123456789] cgroup.init " FINIT_LIBPATH_ "/keventd -- Finit kernel event daemon", global_rlimit, NULL); + if (whichp(FINIT_EXECPATH_ "/keventd")) + 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 ..."); plugin_run_hooks(HOOK_SVC_PLUGIN); diff --git a/src/finit.h b/src/finit.h index 5cebe6ab..ac6ebedf 100644 --- a/src/finit.h +++ b/src/finit.h @@ -54,10 +54,10 @@ #define FINIT_CGPATH "/sys/fs/cgroup" #endif -/* To use these, include config.h, or define FINIT_LIBPATH_ */ -#define _PATH_LOGIT FINIT_LIBPATH_ "/logit" -#define _PATH_SULOGIN FINIT_LIBPATH_ "/sulogin" -#define _PATH_GETTY FINIT_LIBPATH_ "/getty" +/* To use these, include config.h, or define FINIT_EXECPATH_ */ +#define _PATH_LOGIT FINIT_EXECPATH_ "/logit" +#define _PATH_SULOGIN FINIT_EXECPATH_ "/sulogin" +#define _PATH_GETTY FINIT_EXECPATH_ "/getty" #define CMD_SIZE 256 #define LINE_SIZE 1024