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_init_vars | 1 + 1 file changed, 1 insertion(+) (limited to 'package/configure-snippets/configure_init_vars') diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index a156235..0130a0a 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -4,6 +4,7 @@ repodir= bootdb= stmpdir=/run/s6-frontend conffile='$sysconfdir/s6.conf' +userconffile='$sysconfdir/s6-user.conf' storelist='$prefix/share/s6/sources:$sysconfdir/s6/sources' defbundle= fdhuser= -- cgit v1.3.1