diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-11 18:01:29 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-11 18:01:29 +0000 |
| commit | 7d717a323bbc1558ee7710b3598c681388748652 (patch) | |
| tree | 2870a8d2ca5dc84f575bf90f789633548ea411b7 /package | |
| parent | 1ede5e54c796f37114004b2ded0071cb54a8e2a7 (diff) | |
| download | s6-frontend-7d717a323bbc1558ee7710b3598c681388748652.tar.gz | |
More config dir options
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'package')
5 files changed, 61 insertions, 5 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index be1fcb4..3d94ecc 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -1,3 +1,9 @@ + --scandir=*) scandir=${arg#*=} ;; + --livedir=*) livedir=${arg#*=} ;; + --repodir=*) repodir=${arg#*=} ;; + --bootdir=*) bootdir=${arg#*=} ;; + --syspkgdir=*) syspkgdir=${arg#*=} ;; + --localpkgdir=*) localpkgdir=${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 8161153..70f56a6 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -1,17 +1,49 @@ +echo "#undef ${package_macro_name}_USE_UTIL_LINUX" +if $useutillinux ; then + echo "#define ${package_macro_name}_USE_UTIL_LINUX" +fi + echo "#undef ${package_macro_name}_USE_S6LI" if $uses6li ; then echo "#define ${package_macro_name}_USE_S6LI" - echo "#include <s6-linux-init/config.h>" + echo '#include <s6-linux-init/config.h>' + scandirdefault='S6_LINUX_INIT_TMPFS "/" S6_LINUX_INIT_SCANDIR' +else + scandirdefault='"/run/service"' fi -echo "#undef ${package_macro_name}_USE_UTIL_LINUX" -if $useutillinux ; then - echo "#define ${package_macro_name}_USE_UTIL_LINUX" + +echo "#undef ${package_macro_name}_SCANDIR" +if test -n "$scandir" ; then + echo "#define ${package_macro_name}_SCANDIR \"$scandir\"" +else + echo "#define ${package_macro_name}_SCANDIR $scandirdefault" +fi + +echo "#undef ${package_macro_name}_LIVEDIR" +if test -n "$livedir" ; then + echo "#define ${package_macro_name}_LIVEDIR \"$livedir\"" +else + echo "#include <s6-rc/config.h>" + echo "#define ${package_macro_name}_LIVEDIR S6RC_LIVE_BASE" fi +echo "#undef ${package_macro_name}_REPODIR" +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}_SYSPKGDIR" +echo "#define ${package_macro_name}_SYSPKGDIR \"$syspkgdir\"" + +echo "#undef ${package_macro_name}_LOCALPKGDIR" +echo "#define ${package_macro_name}_LOCALPKGDIR \"$localpkgdir\"" + echo "#undef ${package_macro_name}_WRAP_DAEMONTOOLS" if $adaemontools ; then echo "#define ${package_macro_name}_WRAP_DAEMONTOOLS" fi + echo "#undef ${package_macro_name}_WRAP_RUNIT" if $arunit ; then echo "#define ${package_macro_name}_WRAP_RUNIT" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index fc9bc0d..ddacd4a 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -6,6 +6,13 @@ else echo "MAYBEPTHREAD_LIB :=" fi +echo "SCANDIR := $scandir" +echo "LIVEDIR := $livedir" +echo "REPODIR := $repodir" +echo "BOOTDIR := $bootdir" +echo "SYSPKGDIR := $syspkgdir" +echo "LOCALPKGDIR := $localpkgdir" + if $adaemontools ; then echo "WRAP_DAEMONTOOLS := 1" else diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install index 8b13789..73e2a96 100644 --- a/package/configure-snippets/configure_help_install +++ b/package/configure-snippets/configure_help_install @@ -1 +1,6 @@ - + --scandir=DIR assume s6-svscan is running on DIR [s6li default|/run/service] + --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] + --syspkgdir=DIR location of service files for distro packages [/usr/lib/s6-frontend/s6-rc/source] + --localpkgdir=DIR location of service files for local packages [/etc/s6-frontend/s6-rc/source] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index 20675cd..03ee8b6 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -1,3 +1,9 @@ +scandir= +livedir= +repodir=/var/lib/s6-frontend/s6-rc/repository +bootdir=/etc/s6-rc +syspkgdir=/usr/lib/s6-frontend/s6-rc/source +localpkgdir=/etc/s6-frontend/s6-rc/source usensss=false uses6li=true useutillinux=false |