diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-01-06 02:49:58 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-01-06 02:49:58 +0000 |
| commit | 9eee47d2db84cca8fecc3cd33e853d3d39277cda (patch) | |
| tree | 7b0c5bcc9f331fe1c274231e5bfe2a28ec191159 /package | |
| parent | d831d111b8176875cd0e83de798d6c3f5ec593c6 (diff) | |
| download | s6-frontend-9eee47d2db84cca8fecc3cd33e853d3d39277cda.tar.gz | |
Fill out help files, change storepath into storelist
Diffstat (limited to 'package')
6 files changed, 7 insertions, 7 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index 70af1f9..94c1202 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -4,7 +4,7 @@ --bootdb=*) bootdb=${arg#*=} ;; --stmpdir=*) stmpdir=${arg#*=} ;; --with-conf-file=*) conffile=${arg#*=} ;; - --with-store-path=*) storepath=${arg#*=} ;; + --with-store-list=*) storelist=${arg#*=} ;; --with-default-bundle=*) defbundle=${arg#*=} ;; --enable-nsss|--enable-nsss=yes) usensss=true ;; --disable-nsss|--enable-nsss=no) usensss=false ;; diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs index 7b2c617..d4eff64 100644 --- a/package/configure-snippets/configure_expand_dirs +++ b/package/configure-snippets/configure_expand_dirs @@ -1 +1 @@ -stmpdir conffile storepath +stmpdir conffile storelist diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh index 837923d..6fcb60a 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -70,5 +70,5 @@ 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}_STOREPATH" -echo "#define ${package_macro_name}_STOREPATH \"$storepath\"" +echo "#undef ${package_macro_name}_STORELIST" +echo "#define ${package_macro_name}_STORELIST \"$storelist\"" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index da6004c..1fa9ea2 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -3,7 +3,7 @@ echo "LIVEDIR := $livedir" echo "REPODIR := $repodir" echo "BOOTDB := $bootdb" echo "STMPDIR := $stmpdir" -echo "STOREPATH := $storepath" +echo "STORELIST := $storelist" if $usensss ; then echo "LIBNSSS := -lnsss" diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index ed0f440..c36b3ed 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -3,6 +3,6 @@ --enable-util-linux use util-linux functionality [disabled] --with-conf-file=FILE default configuration file for s6 command [SYSCONFDIR/s6-frontend.conf] - --with-store-path=PATH path to 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-frontend/s6-rc/sources:SYSCONFDIR/s6-frontend/s6-rc/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 ef66101..52ffdfc 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -4,7 +4,7 @@ repodir= bootdb= stmpdir=/run/s6-frontend conffile='$sysconfdir/s6-frontend.conf' -storepath='$prefix/share/s6-rc/sources:$sysconfdir/s6-rc/sources' +storelist='$prefix/share/s6-frontend/s6-rc/sources:$sysconfdir/s6-frontend/s6-rc/sources' defbundle= usensss=false |