Separate s6 from s6-frontend, fix configure for no-nsss build

7 files changed, 29 insertions, 7 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 702f462..2844a69 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -3,7 +3,10 @@
     --repodir=*) repodir=${arg#*=} ;;
     --bootdir=*) bootdir=${arg#*=} ;;
     --stmpdir=*) stmpdir=${arg#*=} ;;
+    --conffile=*) conffile=${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 ;;
     --disable-s6li|--enable-s6li=no) uses6li=false ;;
     --enable-util-linux|--enable-util-linux=yes) useutillinux=true ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
index 60c0477..dcf795f 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-stmpdir defpath
+stmpdir conffile defpath
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index d93ea7a..23ce34c 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -28,7 +28,14 @@ else
 fi
 
 echo "#undef ${package_macro_name}_REPODIR"
-echo "#define ${package_macro_name}_REPODIR \"$repodir\""
+if test -n "$repodir" ; then
+  echo "#define ${package_macro_name}_REPODIR \"$repodir\""
+else
+  if test -n "$livedir" ; then
+    echo "#include <s6-rc/config.h>"
+  fi
+  echo "#define ${package_macro_name}_REPODIR S6RC_REPO_BASE"
+fi
 
 echo "#undef ${package_macro_name}_BOOTDIR"
 echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\""
@@ -36,6 +43,9 @@ 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}_CONFFILE"
+echo "#define ${package_macro_name}_CONFFILE \"$conffile\""
+
 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 50b068c..3603f53 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -1,10 +1,15 @@
-echo "LIBNSSS := -lnsss"
-echo "MAYBEPTHREAD_LIB := -lpthread"
 echo "REPODIR := $repodir"
 echo "BOOTDIR := $bootdir"
 echo "STMPDIR := $stmpdir"
 echo "DEFPATH := $defpath"
 
+if $usensss ; then
+  echo "LIBNSSS := -lnsss"
+  echo "MAYBEPTHREAD_LIB := -lpthread"
+else
+  echo "LIBNSSS :="
+  echo "MAYBEPTHREAD_LIB :="
+fi
 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 e35e7e7..8be3412 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -1,6 +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                 s6-frontend working base [/var/lib/s6-frontend/repository]
+  --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]
   --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]
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index c5d4e07..8ef4317 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1,3 +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]
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 3413e00..e0b2853 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -3,7 +3,9 @@ livedir=
 repodir=/var/lib/s6-frontend/s6-rc/repository
 bootdir=/etc/s6-rc
 stmpdir=/run/s6-frontend
+conffile='$sysconfdir/s6-frontend.conf'
 defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source'
+usensss=false
 uses6li=true
 useutillinux=false
 adaemontools=false