diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-18 18:58:34 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-18 18:58:34 +0000 |
| commit | 8a6eaed305dbe4ec6a87fe37000f7461bf563937 (patch) | |
| tree | c80d489ba6852447f56eb805e0ada4005b94b89f /package/configure-snippets | |
| parent | 83622b9b37821cccab3c535209200b9ccd2ba6a3 (diff) | |
| download | s6-frontend-8a6eaed305dbe4ec6a87fe37000f7461bf563937.tar.gz | |
Add a lot of stuff, implement basic service_start
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'package/configure-snippets')
6 files changed, 8 insertions, 1 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index 5d002b8..9285b48 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -2,6 +2,7 @@ --livedir=*) livedir=${arg#*=} ;; --repodir=*) repodir=${arg#*=} ;; --bootdir=*) bootdir=${arg#*=} ;; + --stmpdir=*) stmpdir=${arg#*=} ;; --with-def-path=*) defpath=${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 045c83c..60c0477 100644 --- a/package/configure-snippets/configure_expand_dirs +++ b/package/configure-snippets/configure_expand_dirs @@ -1 +1 @@ -defpath +stmpdir defpath diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh index 14b46d5..d93ea7a 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -33,6 +33,9 @@ echo "#define ${package_macro_name}_REPODIR \"$repodir\"" echo "#undef ${package_macro_name}_BOOTDIR" echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\"" +echo "#undef ${package_macro_name}_STMPDIR" +echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\"" + echo "#undef ${package_macro_name}_DEFPATH" echo "#define ${package_macro_name}_DEFPATH \"$defpath\"" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index ba6a6d6..f1d25a8 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -8,6 +8,7 @@ fi echo "REPODIR := $repodir" echo "BOOTDIR := $bootdir" +echo "STMPDIR := $stmpdir" echo "DEFPATH := $defpath" if $adaemontools ; then diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install index a443a69..e35e7e7 100644 --- a/package/configure-snippets/configure_help_install +++ b/package/configure-snippets/configure_help_install @@ -2,4 +2,5 @@ --livedir=DIR run s6-rc live directory in DIR [s6-rc default|/run/s6-rc] --repodir=DIR s6-frontend working base [/var/lib/s6-frontend/repository] --bootdir=DIR location of the bootable s6-rc compiled db [/etc/s6-rc] + --stmpdir=DIR secure location for temporary s6-frontend files [/run/s6-frontend] --with-def-path=PATH path to service files [LIBDIR/s6-frontend/s6-rc/source:SYSCONFDIR/s6-frontend/s6-rc/source] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index 36c8e65..c6dc45d 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -2,6 +2,7 @@ scandir= livedir= repodir=/var/lib/s6-frontend/s6-rc/repository bootdir=/etc/s6-rc +stmpdir=/run/s6-frontend defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source' usensss=false uses6li=true |