diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-06-13 13:28:18 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-06-13 13:28:18 +0000 |
| commit | f397b21ae0336ed2d6e22a9c7394a2a17497ad32 (patch) | |
| tree | e5982c18bf29b9920b97002959037ce26945ceb1 /src/include-local | |
| parent | 5646d591d90d2fd78a4aeb8e313a1c50a11776c2 (diff) | |
| download | s6-linux-init-f397b21ae0336ed2d6e22a9c7394a2a17497ad32.tar.xz | |
Make scandir compile-time configurable
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/include-local')
| -rw-r--r-- | src/include-local/initctl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/include-local/initctl.h b/src/include-local/initctl.h index a1be5c8..4e3df00 100644 --- a/src/include-local/initctl.h +++ b/src/include-local/initctl.h @@ -5,26 +5,26 @@ #include <s6-linux-init/config.h> -#define SCANDIR "service" +#define SCANDIRFULL S6_LINUX_INIT_TMPFS "/" S6_LINUX_INIT_SCANDIR #define SHUTDOWND_SERVICEDIR "s6-linux-init-shutdownd" #define SHUTDOWND_FIFO "fifo" -#define INITCTL S6_LINUX_INIT_TMPFS "/" SCANDIR "/" SHUTDOWND_SERVICEDIR "/" SHUTDOWND_FIFO +#define INITCTL SCANDIRFULL "/" SHUTDOWND_SERVICEDIR "/" SHUTDOWND_FIFO #define RUNLEVELD_SERVICEDIR "s6-linux-init-runleveld" #define RUNLEVELD_SOCKET "s" -#define RUNLEVELD_PATH S6_LINUX_INIT_TMPFS "/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/" RUNLEVELD_SOCKET +#define RUNLEVELD_PATH SCANDIRFULL "/" RUNLEVELD_SERVICEDIR "/" RUNLEVELD_SOCKET #define LOGOUTHOOKD_SERVICEDIR "s6-linux-init-logouthookd" #define LOGOUTHOOKD_SOCKET "s" -#define LOGOUTHOOKD_PATH S6_LINUX_INIT_TMPFS "/" SCANDIR "/" LOGOUTHOOKD_SERVICEDIR "/" LOGOUTHOOKD_SOCKET +#define LOGOUTHOOKD_PATH SCANDIRFULL "/" LOGOUTHOOKD_SERVICEDIR "/" LOGOUTHOOKD_SOCKET #define LOGGER_SERVICEDIR "s6-svscan-log" #define LOGGER_FIFO "fifo" -#define LOGFIFO S6_LINUX_INIT_TMPFS "/" SCANDIR "/" LOGGER_SERVICEDIR "/" LOGGER_FIFO +#define LOGFIFO SCANDIRFULL "/" LOGGER_SERVICEDIR "/" LOGGER_FIFO #define EARLYGETTY_SERVICEDIR "s6-linux-init-early-getty" -#define EARLYGETTY S6_LINUX_INIT_TMPFS "/" SCANDIR "/" EARLYGETTY_SERVICEDIR +#define EARLYGETTY SCANDIRFULL "/" EARLYGETTY_SERVICEDIR #define CONTAINER_RESULTS "s6-linux-init-container-results" |