diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-06-19 03:57:56 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-06-19 03:57:56 +0000 |
| commit | 29100ede694ef8500f2f63211fff3232d3254516 (patch) | |
| tree | 7ae90fa5a5c13e648001c5ca22802c1d8e400748 /package | |
| parent | 8eb000d3d22fcf7850b43f75ed52068693430d3b (diff) | |
| download | s6-frontend-29100ede694ef8500f2f63211fff3232d3254516.tar.gz | |
Make fdhuser a config variable and --fdholder-user a global option
And remove the -h|--fdholder-user from various subcommands.
Diffstat (limited to 'package')
5 files changed, 7 insertions, 0 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index 96ded94..ed2aaea 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -6,6 +6,7 @@ --conffile=*) conffile=${arg#*=} ;; --with-store-list=*) storelist=${arg#*=} ;; --with-default-bundle=*) defbundle=${arg#*=} ;; + --with-fdholder-user=*) fdhuser=${arg#*=} ;; --enable-nsss|--enable-nsss=yes) usensss=true ;; --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-s6li|--enable-s6li=yes) uses6li=true ;; diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh index 6fcb60a..3f99a88 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -72,3 +72,6 @@ echo "#define ${package_macro_name}_CONF \"$conffile\"" echo "#undef ${package_macro_name}_STORELIST" echo "#define ${package_macro_name}_STORELIST \"$storelist\"" + +echo "#undef ${package_macro_name}_FDHUSER" +echo "#define ${package_macro_name}_FDHUSER \"$fdhuser\"" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index 1fa9ea2..d10c04a 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -4,6 +4,7 @@ echo "REPODIR := $repodir" echo "BOOTDB := $bootdb" echo "STMPDIR := $stmpdir" echo "STORELIST := $storelist" +echo "FDHUSER := $fdhuser" if $usensss ; then echo "LIBNSSS := -lnsss" diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index 1d79b20..8ce4586 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -4,4 +4,5 @@ --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] + --with-fdholder-user=USER s6-fdholderd user to embed in databases [s6-svscan user] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index e9af35a..a156235 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -6,6 +6,7 @@ stmpdir=/run/s6-frontend conffile='$sysconfdir/s6.conf' storelist='$prefix/share/s6/sources:$sysconfdir/s6/sources' defbundle= +fdhuser= usensss=false uses6li=true |