aboutsummaryrefslogtreecommitdiffstats
path: root/package/configure-snippets/configure_init_vars
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2026-09-08 16:12:24 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2026-09-08 16:12:24 +0000
commit5eefb9aae5e9e88b200ff7fcc445120c5ee2998b (patch)
treeaa0bc83b0b5a86dd9a1aab781f36f2c85c8a6b5c /package/configure-snippets/configure_init_vars
parent125cf07d0b5139476b1f25fa4ba5a0782818eacc (diff)
downloads6-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_init_vars')
-rw-r--r--package/configure-snippets/configure_init_vars1
1 files changed, 1 insertions, 0 deletions
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=