diff options
Diffstat (limited to 'package/configure-snippets')
5 files changed, 18 insertions, 3 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index c8ddb82..70af1f9 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -3,8 +3,9 @@ --repodir=*) repodir=${arg#*=} ;; --bootdb=*) bootdb=${arg#*=} ;; --stmpdir=*) stmpdir=${arg#*=} ;; - --conffile=*) conffile=${arg#*=} ;; + --with-conf-file=*) conffile=${arg#*=} ;; --with-store-path=*) storepath=${arg#*=} ;; + --with-default-bundle=*) defbundle=${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 b5b2179..837923d 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -53,6 +53,17 @@ else echo "#define ${package_macro_name}_BOOTDB S6RC_BOOTDB" fi +echo "#undef ${package_macro_name}_DEFBUNDLE" +if test -n "$defbundle" ; then + echo "#define ${package_macro_name}_DEFBUNDLE \"$defbundle\"" +else + if $needs6rcconfig ; then + needs6rcconfig=false + echo "#include <s6-rc/config.h>" + fi + echo "#define ${package_macro_name}_DEFBUNDLE S6RC_DEFBUNDLE" +fi + echo "#undef ${package_macro_name}_STMPDIR" echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\"" @@ -61,4 +72,3 @@ echo "#define ${package_macro_name}_CONF \"$conffile\"" echo "#undef ${package_macro_name}_STOREPATH" echo "#define ${package_macro_name}_STOREPATH \"$storepath\"" - diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install index 080a30e..9deefc1 100644 --- a/package/configure-snippets/configure_help_install +++ b/package/configure-snippets/configure_help_install @@ -4,4 +4,3 @@ --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] - --with-store-path=PATH path to service stores [PREFIX/share/s6-frontend/s6-rc/sources:SYSCONFDIR/s6-frontend/s6-rc/sources] diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index 877c5d9..ed0f440 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -2,3 +2,7 @@ --disable-s6li do not use s6-linux-init functionality [enabled] --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-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 6325b8a..ef66101 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -5,6 +5,7 @@ bootdb= stmpdir=/run/s6-frontend conffile='$sysconfdir/s6-frontend.conf' storepath='$prefix/share/s6-rc/sources:$sysconfdir/s6-rc/sources' +defbundle= usensss=false uses6li=true |