diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-14 13:32:49 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-14 13:32:49 +0000 |
| commit | 331d019eeb1104d4baa6af1d11ad228793b8d97f (patch) | |
| tree | 7a9c8142d587844f23a1bde3432a4f7d57ecd2df /src/s6/s6-internal.h | |
| parent | 7d717a323bbc1558ee7710b3598c681388748652 (diff) | |
| download | s6-frontend-331d019eeb1104d4baa6af1d11ad228793b8d97f.tar.gz | |
Set up configurable policy infrastructure
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/s6/s6-internal.h')
| -rw-r--r-- | src/s6/s6-internal.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/s6/s6-internal.h b/src/s6/s6-internal.h index 6616c87..34a9c16 100644 --- a/src/s6/s6-internal.h +++ b/src/s6/s6-internal.h @@ -8,8 +8,10 @@ #include <stdlib.h> #include <skalibs/functypes.h> -#include <s6-frontend/config.h> +#include <skalibs/stralloc.h> +#include <s6-frontend/config.h> +#include "s6f.h" /* util */ @@ -53,18 +55,24 @@ extern int service (char const *const *) ; struct global_s { unsigned int verbosity ; - char const *scandir ; - char const *livedir ; - char const *repodir ; + s6f_confdirs dirs ; + stralloc userstorage ; + uint8_t isuser : 1 ; uint8_t istty : 1 ; uint8_t color : 1 ; } ; #define GLOBAL_ZERO \ { \ .verbosity = 1, \ - .scandir = S6_FRONTEND_SCANDIR, \ - .livedir = S6_FRONTEND_LIVEDIR, \ - .repodir = S6_FRONTEND_REPODIR, \ + .dirs = \ + { \ + .scan = S6_FRONTEND_SCANDIR, \ + .live = S6_FRONTEND_LIVEDIR, \ + .repo = S6_FRONTEND_REPODIR, \ + .boot = S6_FRONTEND_BOOTDIR, \ + }, \ + .userstorage = STRALLOC_ZERO, \ + .isuser = 0, \ .istty = 0, \ .color = 0 \ } |