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.

1 files changed, 3 insertions, 1 deletions

diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index 82ead11..7c4502a 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -3,4 +3,6 @@
   --repodir=DIR                 default s6-rc repository [s6-rc default: /var/lib/s6-rc/repository]
   --bootdb=LINK                 location of the bootable s6-rc compiled db [s6-rc default: /etc/s6-rc/compiled/current]
   --stmpdir=DIR                 secure location for temporary s6-frontend files [/run/s6-frontend]
-  --conffile=FILE               default configuration file for s6 command [SYSCONFDIR/s6.conf]
+  --conffile=FILE               default system configuration file for the s6 command [SYSCONFDIR/s6.conf]
+  --userconffile=FILE           default user configuration file for the s6 command [SYSCONFDIR/s6-user.conf]
+