From 8a6eaed305dbe4ec6a87fe37000f7461bf563937 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 18 Jun 2025 18:58:34 +0000 Subject: Add a lot of stuff, implement basic service_start Signed-off-by: Laurent Bercot --- configure | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index e8d1c16..0171d4b 100755 --- a/configure +++ b/configure @@ -29,6 +29,7 @@ Fine tuning of the installation directories: --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] If no --prefix option is given, by default libdir (but not dynlibdir) will be /usr/lib, and includedir will be /usr/include. @@ -182,6 +183,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 @@ -230,6 +232,7 @@ for arg ; do --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 ;; @@ -271,7 +274,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot defpath ; do +for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot stmpdir defpath ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -558,6 +561,7 @@ fi echo "REPODIR := $repodir" echo "BOOTDIR := $bootdir" +echo "STMPDIR := $stmpdir" echo "DEFPATH := $defpath" if $adaemontools ; then @@ -641,6 +645,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\"" -- cgit v1.3.1