From 5eefb9aae5e9e88b200ff7fcc445120c5ee2998b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 8 Sep 2026 16:12:24 +0000 Subject: 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. --- package/configure-snippets/configure_generate_configh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package/configure-snippets/configure_generate_configh') 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\"" -- cgit v1.3.1