Set up configurable policy infrastructure

Signed-off-by: Laurent Bercot <ska@appnovation.com>

7 files changed, 11 insertions, 17 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 3d94ecc..5d002b8 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -2,8 +2,7 @@
     --livedir=*) livedir=${arg#*=} ;;
     --repodir=*) repodir=${arg#*=} ;;
     --bootdir=*) bootdir=${arg#*=} ;;
-    --syspkgdir=*) syspkgdir=${arg#*=} ;;
-    --localpkgdir=*) localpkgdir=${arg#*=} ;;
+    --with-def-path=*) defpath=${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_expand_dirs b/package/configure-snippets/configure_expand_dirs
index 8b13789..045c83c 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-
+defpath
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index 70f56a6..14b46d5 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -33,11 +33,8 @@ 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}_DEFPATH"
+echo "#define ${package_macro_name}_DEFPATH \"$defpath\""
 
 echo "#undef ${package_macro_name}_WRAP_DAEMONTOOLS"
 if $adaemontools ; then
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index ddacd4a..ba6a6d6 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -6,12 +6,9 @@ else
   echo "MAYBEPTHREAD_LIB :="
 fi
 
-echo "SCANDIR := $scandir"
-echo "LIVEDIR := $livedir"
 echo "REPODIR := $repodir"
 echo "BOOTDIR := $bootdir"
-echo "SYSPKGDIR := $syspkgdir"
-echo "LOCALPKGDIR := $localpkgdir"
+echo "DEFPATH := $defpath"
 
 if $adaemontools ; then
   echo "WRAP_DAEMONTOOLS := 1"
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index 73e2a96..a443a69 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -2,5 +2,4 @@
   --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]
+  --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 03ee8b6..36c8e65 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -2,8 +2,7 @@ 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
+defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source'
 usensss=false
 uses6li=true
 useutillinux=false
diff --git a/package/deps.mak b/package/deps.mak
index 35933be..be5493e 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -2,11 +2,12 @@
 # This file has been generated by tools/gen-deps.sh
 #
 
-src/s6/s6-internal.h: src/include/s6-frontend/config.h
+src/s6/s6-internal.h: src/include/s6-frontend/config.h src/include-local/s6f.h
 src/alias/s6-frontend-alias-chpst.o src/alias/s6-frontend-alias-chpst.lo: src/alias/s6-frontend-alias-chpst.c
 src/alias/s6-frontend-alias-sv.o src/alias/s6-frontend-alias-sv.lo: src/alias/s6-frontend-alias-sv.c
 src/alias/s6-frontend-alias.o src/alias/s6-frontend-alias.lo: src/alias/s6-frontend-alias.c src/include/s6-frontend/config.h
 src/config/s6-frontend-config-preprocess.o src/config/s6-frontend-config-preprocess.lo: src/config/s6-frontend-config-preprocess.c
+src/libs6f/s6f_user_get_confdirs.o src/libs6f/s6f_user_get_confdirs.lo: src/libs6f/s6f_user_get_confdirs.c src/include-local/s6-internal.h
 src/s6/help.o src/s6/help.lo: src/s6/help.c src/s6/s6-internal.h
 src/s6/process.o src/s6/process.lo: src/s6/process.c src/s6/s6-internal.h
 src/s6/process_kill.o src/s6/process_kill.lo: src/s6/process_kill.c src/s6/s6-internal.h
@@ -29,6 +30,8 @@ s6-frontend-alias-sv: EXTRA_LIBS := ${SPAWN_LIB}
 s6-frontend-alias-sv: src/alias/s6-frontend-alias-sv.o -ls6 -lskarnet
 s6-frontend-config-preprocess: EXTRA_LIBS :=
 s6-frontend-config-preprocess: src/config/s6-frontend-config-preprocess.o -lskarnet
+s6f: EXTRA_LIBS :=
+s6f: src/libs6f/s6f.o src/libs6f/s6f_user_get_confdirs.o
 s6: EXTRA_LIBS :=
 s6: src/s6/s6.o src/s6/help.o src/s6/util.o src/s6/process.o src/s6/process_kill.o src/s6/process_restart.o src/s6/process_start.o src/s6/process_status.o src/s6/process_stop.o src/s6/service.o src/s6/service_start.o src/s6/service_status.o src/s6/service_stop.o -ls6 -lskarnet
 INTERNAL_LIBS :=