diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-09-08 16:12:24 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-09-08 16:12:24 +0000 |
| commit | 5eefb9aae5e9e88b200ff7fcc445120c5ee2998b (patch) | |
| tree | aa0bc83b0b5a86dd9a1aab781f36f2c85c8a6b5c /package/configure-snippets/configure_generate_configh | |
| parent | 125cf07d0b5139476b1f25fa4ba5a0782818eacc (diff) | |
| download | s6-frontend-5eefb9aae5e9e88b200ff7fcc445120c5ee2998b.tar.gz | |
Improve user service management
- Separate /etc/s6.conf from /etc/s6-user.conf
- Have --system|--user handled at the s6 level, not the s6-frontend level
- Also have --help rewritten at the s6 level because it's cleaner
- On --user, process the config file with sed to import XDG variables
- Do not use s6f_user_get_confdirs() anymore (can remove it if we
decide to stick with this design), --user now only changes the
conf file, and only command-line options such as --scandir can override
what is described in the conf file.
- Document the current behaviour.
Diffstat (limited to 'package/configure-snippets/configure_generate_configh')
| -rw-r--r-- | package/configure-snippets/configure_generate_configh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh index 3f99a88..171c246 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -70,6 +70,9 @@ echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\"" echo "#undef ${package_macro_name}_CONF" echo "#define ${package_macro_name}_CONF \"$conffile\"" +echo "#undef ${package_macro_name}_USER_CONF" +echo "#define ${package_macro_name}_USER_CONF \"$userconffile\"" + echo "#undef ${package_macro_name}_STORELIST" echo "#define ${package_macro_name}_STORELIST \"$storelist\"" |