diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-06-09 03:54:33 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-06-09 03:54:33 +0000 |
| commit | e7dc6510922fc3ed14df061a1bac552da59b62e9 (patch) | |
| tree | c0c4c0496feeff650c5544b5e7d9b2b43b08e6a2 /package | |
| parent | 86d072b07cff432b3ab558ab6747260828bec192 (diff) | |
| download | s6-frontend-e7dc6510922fc3ed14df061a1bac552da59b62e9.tar.gz | |
Change default storelist and configuration file
Default storelist becomes /usr/share/s6/sources:/etc/s6/sources
Default configuration file becomes /etc/s6.conf
Conffile environment variable becomes S6_CONF
Diffstat (limited to 'package')
| -rw-r--r-- | package/configure-snippets/configure_help_install | 2 | ||||
| -rw-r--r-- | package/configure-snippets/configure_help_options | 2 | ||||
| -rw-r--r-- | package/configure-snippets/configure_init_vars | 4 | ||||
| -rw-r--r-- | package/deps-build | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install index ff03391..82ead11 100644 --- a/package/configure-snippets/configure_help_install +++ b/package/configure-snippets/configure_help_install @@ -3,4 +3,4 @@ --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-frontend.conf] + --conffile=FILE default configuration file for s6 command [SYSCONFDIR/s6.conf] diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index 1f4150d..1d79b20 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -2,6 +2,6 @@ --disable-s6li do not use s6-linux-init functionality [enabled] --enable-util-linux use util-linux functionality [disabled] - --with-store-list=LIST list of service stores [PREFIX/share/s6-frontend/s6-rc/sources:SYSCONFDIR/s6-frontend/s6-rc/sources] + --with-store-list=LIST list of service stores [PREFIX/share/s6/sources:SYSCONFDIR/s6/sources] --with-default-bundle=NAME name of the bundle started at boot [s6-rc default: default] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index 52ffdfc..e9af35a 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -3,8 +3,8 @@ livedir= repodir= bootdb= stmpdir=/run/s6-frontend -conffile='$sysconfdir/s6-frontend.conf' -storelist='$prefix/share/s6-frontend/s6-rc/sources:$sysconfdir/s6-frontend/s6-rc/sources' +conffile='$sysconfdir/s6.conf' +storelist='$prefix/share/s6/sources:$sysconfdir/s6/sources' defbundle= usensss=false diff --git a/package/deps-build b/package/deps-build index eb95d54..bfb4e0f 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1,6 +1,6 @@ true true /package/prog/skalibs 2.15.0.1 libskarnet $usensss $usensss /package/admin/nsss 0.2.1.2 libnsss true false /package/admin/execline 2.9.9.2 libexecline -true false /package/admin/s6 2.15.0.1 libs6 libs6auto +true false /package/admin/s6 2.15.1.0 libs6 libs6auto true false /package/admin/s6-rc 0.6.1.2 libs6rc true false /package/admin/s6-linux-init 1.2.0.2 |