Add a lot of stuff, implement basic service_start

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

20 files changed, 262 insertions, 15 deletions

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\""
 
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 5d002b8..9285b48 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -2,6 +2,7 @@
     --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 ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
index 045c83c..60c0477 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-defpath
+stmpdir defpath
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index 14b46d5..d93ea7a 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -33,6 +33,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\""
 
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index ba6a6d6..f1d25a8 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -8,6 +8,7 @@ fi
 
 echo "REPODIR := $repodir"
 echo "BOOTDIR := $bootdir"
+echo "STMPDIR := $stmpdir"
 echo "DEFPATH := $defpath"
 
 if $adaemontools ; then
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index a443a69..e35e7e7 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -2,4 +2,5 @@
   --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]
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 36c8e65..c6dc45d 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -2,6 +2,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
diff --git a/package/deps.mak b/package/deps.mak
index c9d5970..4f40ecf 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -7,6 +7,10 @@ src/alias/s6-frontend-alias-chpst.o src/alias/s6-frontend-alias-chpst.lo: src/al
 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_confdir_open.o src/libs6f/s6f_confdir_open.lo: src/libs6f/s6f_confdir_open.c src/include-local/s6f.h
+src/libs6f/s6f_lock.o src/libs6f/s6f_lock.lo: src/libs6f/s6f_lock.c src/include-local/s6f.h
+src/libs6f/s6f_mkdirp.o src/libs6f/s6f_mkdirp.lo: src/libs6f/s6f_mkdirp.c src/include-local/s6f.h
+src/libs6f/s6f_report_state_change.o src/libs6f/s6f_report_state_change.lo: src/libs6f/s6f_report_state_change.c src/include-local/s6f.h
 src/libs6f/s6f_user_get_confdirs.o src/libs6f/s6f_user_get_confdirs.lo: src/libs6f/s6f_user_get_confdirs.c src/include-local/s6f.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
@@ -31,12 +35,10 @@ 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
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-libs6f.a.xyzzy: src/libs6f/s6f_user_get_confdirs.o ${LIBNSSS}
+libs6f.a.xyzzy: src/libs6f/s6f_confdir_open.o src/libs6f/s6f_lock.o src/libs6f/s6f_mkdirp.o src/libs6f/s6f_report_state_change.o src/libs6f/s6f_user_get_confdirs.o ${LIBNSSS}
 else
-libs6f.a.xyzzy:src/libs6f/s6f_user_get_confdirs.lo ${LIBNSSS}
+libs6f.a.xyzzy:src/libs6f/s6f_confdir_open.lo src/libs6f/s6f_lock.lo src/libs6f/s6f_mkdirp.lo src/libs6f/s6f_report_state_change.lo src/libs6f/s6f_user_get_confdirs.lo ${LIBNSSS}
 endif
-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 libs6f.a.xyzzy -ls6 -lskarnet
+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 libs6f.a.xyzzy -ls6rc -ls6 -lskarnet
 INTERNAL_LIBS := libs6f.a.xyzzy
diff --git a/src/include-local/s6f.h b/src/include-local/s6f.h
index 4879536..2eafd75 100644
--- a/src/include-local/s6f.h
+++ b/src/include-local/s6f.h
@@ -3,6 +3,9 @@
 #ifndef S6F_H
 #define S6F_H
 
+#include <sys/stat.h>
+#include <stdint.h>
+
 #include <skalibs/stralloc.h>
 
 typedef struct s6f_confdirs_s s6f_confdirs, *s6f_confdirs_ref ;
@@ -12,8 +15,15 @@ struct s6f_confdirs_s
   char const *live ;  /* $XDG_RUNTIME_DIR/s6-rc */
   char const *repo ;  /* $XDG_DATA_HOME/s6-frontend/repository */
   char const *boot ;  /* $XDG_CONFIG_HOME/s6-rc */
+  char const *stmp ;  /* $XDG_RUNTIME_DIR/s6-frontend */
 } ;
 
+extern void s6f_mkdirp (char const *, mode_t) ;
+extern int s6f_confdir_open (char const *, int) ;
+extern int s6f_lock (char const *, int) ;
+
+extern void s6f_report_state_change (uint32_t, unsigned char const *, unsigned char const *, char const *) ;
+
 extern void s6f_user_get_confdirs (s6f_confdirs *, stralloc *) ;
 
 #endif
diff --git a/src/libs6f/deps-exe/s6f b/src/libs6f/deps-exe/s6f
deleted file mode 100644
index e77c0cc..0000000
--- a/src/libs6f/deps-exe/s6f
+++ /dev/null
@@ -1 +0,0 @@
-s6f_user_get_confdirs.o
diff --git a/src/libs6f/deps-lib/s6f b/src/libs6f/deps-lib/s6f
index c792b84..ab20410 100644
--- a/src/libs6f/deps-lib/s6f
+++ b/src/libs6f/deps-lib/s6f
@@ -1,4 +1,9 @@
+s6f_confdir_open.o
+s6f_lock.o
+s6f_mkdirp.o
+s6f_report_state_change.o
 s6f_user_get_confdirs.o
 ${LIBNSSS}
+-ls6rc
 -lskarnet
 ${MAYBEPTHREAD_LIB}
diff --git a/src/libs6f/s6f_confdir_open.c b/src/libs6f/s6f_confdir_open.c
new file mode 100644
index 0000000..8e0838f
--- /dev/null
+++ b/src/libs6f/s6f_confdir_open.c
@@ -0,0 +1,38 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>
+
+#include <unistd.h>
+#include <errno.h>
+
+#include <skalibs/stat.h>
+#include <skalibs/strerr.h>
+#include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
+
+#include "s6f.h"
+
+int s6f_confdir_open (char const *s, int flagcreate)
+{
+  struct stat st ;
+  int fd = open_read(s) ;
+  if (fd == -1)
+  {
+    if (errno != ENOENT || !flagcreate)
+      strerr_diefu3sys(111, "open ", s, " for reading") ;
+    if (flagcreate)
+    {
+      s6f_mkdirp(s, 02755) ;
+      fd = open_read(s) ;
+      if (fd == -1)
+        strerr_diefu3sys(111, "open ", s, " for reading") ;
+    }
+  }
+  if (fstat(fd, &st) == -1)
+    strerr_diefu2sys(111, "fstat ", s) ;
+  if (!S_ISDIR(st.st_mode))
+    strerr_dief2x(111, s, " is not a directory") ;
+  if (access_at(fd, ".", R_OK|W_OK, 1) == -1)
+    strerr_diefu2sys(111, "access ", s) ;
+  return fd ;
+}
diff --git a/src/libs6f/s6f_lock.c b/src/libs6f/s6f_lock.c
new file mode 100644
index 0000000..1ef1718
--- /dev/null
+++ b/src/libs6f/s6f_lock.c
@@ -0,0 +1,20 @@
+/* ISC license. */
+
+#include <string.h>
+
+#include <skalibs/strerr.h>
+#include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
+
+#include "s6f.h"
+
+int s6f_lock (char const *stmpdir, int w)
+{
+  int fdstmp = s6f_confdir_open(stmpdir, 1) ;
+  int fd = openc_truncat(fdstmp, "lock") ;
+  if (fd == -1) strerr_diefu4sys(111, "open ", stmpdir, "/lock", " for writing") ;
+  fd_close(fdstmp) ;
+  if (fd_lock(fd, w, 0) < 1)
+    strerr_diefu3sys(111, "lock ", stmpdir, "/lock") ;
+  return fd ;
+}
diff --git a/src/libs6f/s6f_mkdirp.c b/src/libs6f/s6f_mkdirp.c
new file mode 100644
index 0000000..e8b6be8
--- /dev/null
+++ b/src/libs6f/s6f_mkdirp.c
@@ -0,0 +1,17 @@
+/* ISC license. */
+
+#include <string.h>
+
+#include <skalibs/posixplz.h>
+#include <skalibs/strerr.h>
+
+#include "s6f.h"
+
+void s6f_mkdirp (char const *s, mode_t mode)
+{
+  size_t len = strlen(s) ;
+  char tmp[len + 1] ;
+  memcpy(tmp, s, len + 1) ;
+  if (mkdirp(tmp, mode) == -1)
+    strerr_diefu2sys(111, "mkdir ", tmp) ;
+}
diff --git a/src/libs6f/s6f_report_state_change.c b/src/libs6f/s6f_report_state_change.c
new file mode 100644
index 0000000..70d2cd1
--- /dev/null
+++ b/src/libs6f/s6f_report_state_change.c
@@ -0,0 +1,64 @@
+/* ISC license. */
+
+#include <string.h>
+
+#include <skalibs/prog.h>
+#include <skalibs/strerr.h>
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/s6rc-db.h>
+
+#include "s6f.h"
+
+void s6f_report_state_change (uint32_t n, unsigned char const *oldstate, unsigned char const *newstate, char const *compiled)
+{
+  if (!memcmp(oldstate, newstate, n))
+  {
+    if (buffer_puts(buffer_1, PROG) < 0
+     || buffer_puts(buffer_1, ": info: ") < 0
+     || buffer_putsflush(buffer_1, "the global state has not changed.\n") < 0)
+      strerr_diefu1sys(111, "write to stdout") ;
+  }
+  else
+  {
+    s6rc_db_t db ;
+    int fd = openc_readb(compiled) ;
+    if (fd == -1) strerr_diefu2sys(111, "open ", compiled) ;
+    if (!s6rc_db_read_sizes(fd, &db))
+      strerr_diefu2sys(111, "read db sizes for ", compiled) ;
+
+    {
+      s6rc_service_t serviceblob[n] ;
+      char const *argvblob[db.nargvs] ;
+      uint32_t depsblob[db.ndeps << 1] ;
+      uint32_t producersblob[db.nproducers] ;
+      int r ;
+      char stringblob[db.stringlen] ;
+      db.services = serviceblob ;
+      db.argvs = argvblob ;
+      db.deps = depsblob ;
+      db.producers = producersblob ;
+      db.string = stringblob ;
+
+      r = s6rc_db_read(fd, &db) ;
+      if (r < 0) strerr_diefu3sys(111, "read ", compiled, "/db") ;
+      if (!r) strerr_dief3x(4, "invalid service database in ", compiled, "/db") ;
+
+      if (buffer_puts(buffer_1, PROG) < 0
+       || buffer_puts(buffer_1, ": info: the following atomic services have changed state:\n") < 0)
+        strerr_diefu1sys(111, "write to stdout") ;
+      for (uint32_t i = 0 ; i < n ; i++)
+      {
+        if ((oldstate[i] & 1) != (newstate[i] & 1))
+        {
+          if (buffer_puts(buffer_1, db.string + db.services[i].name) < 0
+           || buffer_put(buffer_1, "\n", 1) < 1)
+            strerr_diefu1sys(111, "write to stdout") ;
+        }
+      }
+      if (!buffer_flush(buffer_1))
+        strerr_diefu1sys(111, "write to stdout") ;
+    }
+    fd_close(fd) ;
+  }
+}
diff --git a/src/libs6f/s6f_user_get_confdirs.c b/src/libs6f/s6f_user_get_confdirs.c
index badbea0..b062650 100644
--- a/src/libs6f/s6f_user_get_confdirs.c
+++ b/src/libs6f/s6f_user_get_confdirs.c
@@ -16,7 +16,7 @@
 
 void s6f_user_get_confdirs (s6f_confdirs *dirs, stralloc *storage)
 {
-  size_t scanpos, livepos, repopos, bootpos ;
+  size_t scanpos, livepos, repopos, bootpos, stmppos ;
   size_t homelen = 0 ;
   struct passwd *pw = 0 ;
   char const *home = 0 ;
@@ -71,10 +71,16 @@ void s6f_user_get_confdirs (s6f_confdirs *dirs, stralloc *storage)
    || !stralloc_cats(storage, "/s6-rc")
    || !stralloc_0(storage)) dienomem() ;
 
+  stmppos = storage->len ;
+  if (!stralloc_cats(storage, runtime)
+   || !stralloc_cats(storage, "/s6-frontend")
+   || !stralloc_0(storage)) dienomem() ;
+
  /* Don't add to storage past this point */
 
   dirs->scan = storage->s + scanpos ;
   dirs->live = storage->s + livepos ;
   dirs->repo = storage->s + repopos ;
   dirs->boot = storage->s + bootpos ;
+  dirs->stmp = storage->s + stmppos ;
 }
diff --git a/src/s6/deps-exe/s6 b/src/s6/deps-exe/s6
index e3cd3b7..1d03ef1 100644
--- a/src/s6/deps-exe/s6
+++ b/src/s6/deps-exe/s6
@@ -11,5 +11,6 @@ service_start.o
 service_status.o
 service_stop.o
 libs6f.a.xyzzy
+-ls6rc
 -ls6
 -lskarnet
diff --git a/src/s6/s6-internal.h b/src/s6/s6-internal.h
index 34a9c16..6ee3939 100644
--- a/src/s6/s6-internal.h
+++ b/src/s6/s6-internal.h
@@ -70,6 +70,7 @@ struct global_s
     .live = S6_FRONTEND_LIVEDIR, \
     .repo = S6_FRONTEND_REPODIR, \
     .boot = S6_FRONTEND_BOOTDIR, \
+    .stmp = S6_FRONTEND_STMPDIR, \
   }, \
   .userstorage = STRALLOC_ZERO, \
   .isuser = 0, \
diff --git a/src/s6/s6.c b/src/s6/s6.c
index 8d5295c..2467f3c 100644
--- a/src/s6/s6.c
+++ b/src/s6/s6.c
@@ -42,6 +42,7 @@ enum main_gola_e
   MAIN_GOLA_LIVEDIR,
   MAIN_GOLA_REPODIR,
   MAIN_GOLA_BOOTDIR,
+  MAIN_GOLA_STMPDIR,
   MAIN_GOLA_VERBOSITY,
   MAIN_GOLA_COLOR,
   MAIN_GOLA_N
@@ -60,6 +61,7 @@ static gol_arg const main_gola[MAIN_GOLA_N] =
   { .so = 'l', .lo = "livedir", .i = MAIN_GOLA_LIVEDIR },
   { .so = 'r', .lo = "repodir", .i = MAIN_GOLA_REPODIR },
   { .so = 'b', .lo = "bootdir", .i = MAIN_GOLA_BOOTDIR },
+  { .so = 0,   .lo = "stmpdir", .i = MAIN_GOLA_STMPDIR },
   { .so = 'v', .lo = "verbosity", .i = MAIN_GOLA_VERBOSITY },
   { .so = 0,   .lo = "color", .i = MAIN_GOLA_COLOR }
 } ;
@@ -98,6 +100,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   if (gola[MAIN_GOLA_LIVEDIR]) g->dirs.live = gola[MAIN_GOLA_LIVEDIR] ;
   if (gola[MAIN_GOLA_REPODIR]) g->dirs.repo = gola[MAIN_GOLA_REPODIR] ;
   if (gola[MAIN_GOLA_BOOTDIR]) g->dirs.boot = gola[MAIN_GOLA_BOOTDIR] ;
+  if (gola[MAIN_GOLA_STMPDIR]) g->dirs.stmp = gola[MAIN_GOLA_STMPDIR] ;
 
   {
     int force_color = 0 ;
diff --git a/src/s6/service_start.c b/src/s6/service_start.c
index 8e876ea..90a3087 100644
--- a/src/s6/service_start.c
+++ b/src/s6/service_start.c
@@ -1,11 +1,19 @@
 /* ISC license. */
 
+#include <string.h>
+#include <sys/wait.h>
+
+#include <skalibs/posixplz.h>
 #include <skalibs/uint64.h>
+#include <skalibs/types.h>
 #include <skalibs/strerr.h>
 #include <skalibs/gol.h>
 #include <skalibs/env.h>
+#include <skalibs/cspawn.h>
+#include <skalibs/djbunix.h>
 
 #include <s6-rc/config.h>
+#include <s6-rc/s6rc-utils.h>
 
 #include "s6-internal.h"
 
@@ -19,6 +27,12 @@ enum service_start_golb_e
   SERVICE_START_GOLB_N
 } ;
 
+enum service_start_gola_e
+{
+  SERVICE_START_GOLA_TIMEOUT,
+  SERVICE_START_GOLA_N
+} ;
+
 static gol_bool const service_start_golb[3] =
 {
   { .so = 'n', .lo = "dryrun", .set = 1, .mask = 1 << SERVICE_START_GOLB_DRYRUN },
@@ -26,30 +40,83 @@ static gol_bool const service_start_golb[3] =
   { .so = 'w', .lo = "wait", .set = 1, .mask = 1 << SERVICE_START_GOLB_WAIT }
 } ;
 
+static gol_arg const service_start_gola[SERVICE_START_GOLA_N] =
+{
+  { .so = 't', .lo = "timeout", .i = SERVICE_START_GOLA_TIMEOUT }
+} ;
+
 int service_start (char const *const *argv)
 {
-  size_t argc = env_len(argv) ;
+  char const *gola[SERVICE_START_GOLA_N] = { 0 } ;
   uint64_t golb = 0 ;
+  unsigned int t = 0 ;
+  size_t argc = env_len(argv) ;
+  pid_t pid ;
+  int wstat ;
+  uint32_t nlong, nshort, n ;
+  int livelock, compiledlock ;
+  size_t livelen = strlen(g->dirs.live) ;
   PROG = "s6 service start" ;
 
-  argv += gol_argv(argv, service_start_golb, 0, 0, 0, &golb, 0) ;
-  if (!argv) dieusage() ;
+  argv += gol_argv(argv, service_start_golb, 3, service_start_gola, SERVICE_START_GOLA_N, &golb, gola) ;
+  if (!*argv) dieusage() ;
+
+  if (gola[SERVICE_START_GOLA_TIMEOUT])
+  {
+    if (!uint0_scan(gola[SERVICE_START_GOLA_TIMEOUT], &t))
+      strerr_dief1x(100, "timeout must be an integer (milliseconds)") ;
+  }
+  s6f_lock(g->dirs.stmp, 0) ;  /* leaks, it's fine */
+  char dbfn[livelen + 10] ;
+  memcpy(dbfn, g->dirs.live, livelen) ;
+  memcpy(dbfn + livelen, "/compiled", 10) ;
+  if (!s6rc_lock(g->dirs.live, 2, &livelock, dbfn, 1, &compiledlock, 1))
+    strerr_diefu2sys(111, "take lock in ", g->dirs.live) ;
+  if (!s6rc_live_state_size(g->dirs.live, &nlong, &nshort))
+    strerr_diefu2sys(111, "read state size in ", g->dirs.live) ;
+  n = nlong + nshort ;
+  unsigned char oldstate[n] ;
+  if (!s6rc_live_state_read(g->dirs.live, oldstate, n))
+    strerr_diefu2sys(111, "read state in ", g->dirs.live) ;
 
   {
     size_t m = 0 ;
-    char const *newargv[10 + argc] ;
+    char const *newargv[13 + argc] ;
     char fmtv[UINT_FMT] ;
+    char fmtt[UINT_FMT] ;
 
-    newargv[m++] =  S6RC_EXTBINPREFIX "s6-rc" ;
+    newargv[m++] = S6RC_EXTBINPREFIX "s6-rc" ;
+    newargv[m++] = "-X" ;  /* we already took the locks */
     newargv[m++] = "-v" ;
     newargv[m++] = fmtv ;
     fmtv[uint_fmt(fmtv, g->verbosity)] = 0 ;
+    if (t)
+    {
+      newargv[m++] = "-t" ;
+      newargv[m++] = fmtt ;
+      fmtt[uint_fmt(fmtt, t)] = 0 ;
+    }
     if (golb & 1 << SERVICE_START_GOLB_DRYRUN)
     {
       newargv[m++] = "-n" ;
       newargv[m++] = "1" ;
     }
+    newargv[m++] = "-l" ;
+    newargv[m++] = g->dirs.live ;
     newargv[m++] = "--" ;
+    newargv[m++] = "start" ;
+    while (*argv) newargv[m++] = *argv++ ;
+    newargv[m++] = 0 ;
+    pid = cspawn(newargv[0], newargv, (char const *const *)environ, CSPAWN_FLAGS_SIGBLOCKNONE, 0, 0) ;
+    if (!pid) strerr_diefu2sys(111, "spawn ", newargv[0]) ;
   }
-  return 0 ;
+  if (wait_pid(pid, &wstat) <= 0) strerr_diefu1sys(111, "wait for s6-rc") ;
+  if ((WIFEXITED(wstat) && !WEXITSTATUS(wstat)) || !g->verbosity)
+    return wait_estatus(wstat) ;
+
+  unsigned char newstate[n] ;
+  if (!s6rc_live_state_read(g->dirs.live, newstate, n))
+    strerr_diefu2sys(111, "read state in ", g->dirs.live) ;
+  s6f_report_state_change(n, oldstate, newstate, dbfn) ;
+  return wait_estatus(wstat) ;
 }