Lots of work done, doesn't build yet, next commit will

- alias subsystem moved to s6
- config subsystem deleted
- new helpers subsystem, with a s6-frontend-helper-kill program
- new s6f_equote function, to execline-quote an argv
- started the adaptation to the new s6-rc functions, in progress

7 files changed, 36 insertions, 56 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 2844a69..c8ddb82 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1,19 +1,13 @@
     --scandir=*) scandir=${arg#*=} ;;
     --livedir=*) livedir=${arg#*=} ;;
     --repodir=*) repodir=${arg#*=} ;;
-    --bootdir=*) bootdir=${arg#*=} ;;
+    --bootdb=*) bootdb=${arg#*=} ;;
     --stmpdir=*) stmpdir=${arg#*=} ;;
     --conffile=*) conffile=${arg#*=} ;;
-    --with-def-path=*) defpath=${arg#*=} ;;
+    --with-store-path=*) storepath=${arg#*=} ;;
     --enable-nsss|--enable-nsss=yes) usensss=true ;;
     --disable-nsss|--enable-nsss=no) usensss=false ;;
     --enable-s6li|--enable-s6li=yes) uses6li=true ;;
     --disable-s6li|--enable-s6li=no) uses6li=false ;;
     --enable-util-linux|--enable-util-linux=yes) useutillinux=true ;;
     --disable-util-linux|--enable-util-linux=no) useutillinux=false ;;
-    --enable-aliases-daemontools|--enable-aliases-daemontools=yes) adaemontools=true ;;
-    --disable-aliases-daemontools|--enable-aliases-daemontools=no) adaemontools=false ;;
-    --enable-aliases-runit|--enable-aliases-runit=yes) arunit=true ;;
-    --disable-aliases-runit|--enable-aliases-runit=no) arunit=false ;;
-    --enable-aliases-symlinks|--enable-aliases-symlinks=yes) asymlinks=true ;;
-    --disable-aliases-symlinks|--enable-aliases-symlinks=no) asymlinks=false ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
index dcf795f..7b2c617 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-stmpdir conffile defpath
+stmpdir conffile storepath
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index 23ce34c..b5b2179 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -19,42 +19,46 @@ else
   echo "#define ${package_macro_name}_SCANDIR $scandirdefault"
 fi
 
+needs6rcconfig=true
 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"
+  if $needs6rcconfig ; then
+    needs6rcconfig=false
+    echo "#include <s6-rc/config.h>"
+  fi
+  echo "#define ${package_macro_name}_LIVEDIR S6RC_LIVEDIR"
 fi
 
 echo "#undef ${package_macro_name}_REPODIR"
 if test -n "$repodir" ; then
   echo "#define ${package_macro_name}_REPODIR \"$repodir\""
 else
-  if test -n "$livedir" ; then
+  if $needs6rcconfig ; then
+    needs6rcconfig=false
     echo "#include <s6-rc/config.h>"
   fi
-  echo "#define ${package_macro_name}_REPODIR S6RC_REPO_BASE"
+  echo "#define ${package_macro_name}_REPODIR S6RC_REPODIR"
 fi
 
-echo "#undef ${package_macro_name}_BOOTDIR"
-echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\""
+echo "#undef ${package_macro_name}_BOOTDB"
+if test -n "$bootdb" ; then
+  echo "#define ${package_macro_name}_BOOTDB \"$bootdb\""
+else
+  if $needs6rcconfig ; then
+    needs6rcconfig=false
+    echo "#include <s6-rc/config.h>"
+  fi
+  echo "#define ${package_macro_name}_BOOTDB S6RC_BOOTDB"
+fi
 
 echo "#undef ${package_macro_name}_STMPDIR"
 echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\""
 
-echo "#undef ${package_macro_name}_CONFFILE"
-echo "#define ${package_macro_name}_CONFFILE \"$conffile\""
-
-echo "#undef ${package_macro_name}_DEFPATH"
-echo "#define ${package_macro_name}_DEFPATH \"$defpath\""
+echo "#undef ${package_macro_name}_CONF"
+echo "#define ${package_macro_name}_CONF \"$conffile\""
 
-echo "#undef ${package_macro_name}_WRAP_DAEMONTOOLS"
-if $adaemontools ; then
-  echo "#define ${package_macro_name}_WRAP_DAEMONTOOLS"
-fi
+echo "#undef ${package_macro_name}_STOREPATH"
+echo "#define ${package_macro_name}_STOREPATH \"$storepath\""
 
-echo "#undef ${package_macro_name}_WRAP_RUNIT"
-if $arunit ; then
-  echo "#define ${package_macro_name}_WRAP_RUNIT"
-fi
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index 3603f53..da6004c 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -1,7 +1,9 @@
+echo "SCANDIR := $scandir"
+echo "LIVEDIR := $livedir"
 echo "REPODIR := $repodir"
-echo "BOOTDIR := $bootdir"
+echo "BOOTDB := $bootdb"
 echo "STMPDIR := $stmpdir"
-echo "DEFPATH := $defpath"
+echo "STOREPATH := $storepath"
 
 if $usensss ; then
   echo "LIBNSSS := -lnsss"
@@ -10,18 +12,3 @@ else
   echo "LIBNSSS :="
   echo "MAYBEPTHREAD_LIB :="
 fi
-if $adaemontools ; then
-  echo "WRAP_DAEMONTOOLS := 1"
-else
-  echo "WRAP_DAEMONTOOLS :="
-fi
-if $arunit ; then
-  echo "WRAP_RUNIT := 1"
-else
-  echo "WRAP_RUNIT :="
-fi
-if $asymlinks ; then
-  echo "WRAP_SYMLINKS := 1"
-else
-  echo "WRAP_SYMLINKS :="
-fi
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index 8be3412..080a30e 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -1,7 +1,7 @@
   --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                 default s6-rc repository [s6-rc default: /var/lib/s6-frontend/repository]
-  --bootdir=DIR                 location of the bootable s6-rc compiled db [/etc/s6-rc]
+  --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-def-path=PATH          path to service files [LIBDIR/s6-frontend/s6-rc/source:SYSCONFDIR/s6-frontend/s6-rc/source]
+  --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 8ef4317..877c5d9 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1,7 +1,4 @@
   --enable-nsss                 use the nsss library for user information [disabled]
   --disable-s6li                do not use s6-linux-init functionality [enabled]
   --enable-util-linux           use util-linux functionality [disabled]
-  --enable-aliases-daemontools  build emulation of daemontools programs [disabled]
-  --enable-aliases-runit        build emulation of runit programs [disabled]
-  --disable-aliases-symlinks    do not create daemontools/runit multicall symlinks [enabled]
 
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index e0b2853..6325b8a 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1,13 +1,11 @@
 scandir=
 livedir=
-repodir=/var/lib/s6-frontend/s6-rc/repository
-bootdir=/etc/s6-rc
+repodir=
+bootdb=
 stmpdir=/run/s6-frontend
 conffile='$sysconfdir/s6-frontend.conf'
-defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source'
+storepath='$prefix/share/s6-rc/sources:$sysconfdir/s6-rc/sources'
+
 usensss=false
 uses6li=true
 useutillinux=false
-adaemontools=false
-arunit=false
-asymlinks=true