first draft of s6rc_repo_set_compile

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

14 files changed, 298 insertions, 78 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 02a26f3..0a40ea0 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -21,6 +21,7 @@ src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_lock.lo: src/libs6rc/s6rc_lock.c src/in
 src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_read_uint.lo: src/libs6rc/s6rc_read_uint.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_repo_cleanup.o src/libs6rc/s6rc_repo_cleanup.lo: src/libs6rc/s6rc_repo_cleanup.c src/include/s6-rc/repo.h
 src/libs6rc/s6rc_repo_lock.o src/libs6rc/s6rc_repo_lock.lo: src/libs6rc/s6rc_repo_lock.c src/include/s6-rc/repo.h
+src/libs6rc/s6rc_repo_set_compile.o src/libs6rc/s6rc_repo_set_compile.lo: src/libs6rc/s6rc_repo_set_compile.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
 src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_repo_sync.lo: src/libs6rc/s6rc_repo_sync.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_sanitize_dir.lo: src/libs6rc/s6rc_sanitize_dir.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_block.lo: src/libs6rc/s6rc_servicedir_block.c src/include/s6-rc/s6rc-servicedir.h
@@ -47,15 +48,15 @@ src/s6-rc/s6-rc-update.o src/s6-rc/s6-rc-update.lo: src/s6-rc/s6-rc-update.c src
 src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_live_state_size.o src/libs6rc/s6rc_live_state_read.o src/libs6rc/s6rc_livedir_canon.o src/libs6rc/s6rc_livedir_create.o src/libs6rc/s6rc_livedir_prefix.o src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_repo_cleanup.o src/libs6rc/s6rc_repo_lock.o src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_type_check.o
+libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_live_state_size.o src/libs6rc/s6rc_live_state_read.o src/libs6rc/s6rc_livedir_canon.o src/libs6rc/s6rc_livedir_create.o src/libs6rc/s6rc_livedir_prefix.o src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_repo_cleanup.o src/libs6rc/s6rc_repo_lock.o src/libs6rc/s6rc_repo_set_compile.o src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_type_check.o
 else
-libs6rc.a.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
+libs6rc.a.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_set_compile.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
 endif
-libs6rc.pc: EXTRA_LIBS := -ls6 -lskarnet
-libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
-libs6rc.so.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
-libs6rc.dylib.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
-libs6rc.dylib.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
+libs6rc.pc: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
+libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
+libs6rc.so.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_set_compile.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
+libs6rc.dylib.xyzzy: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
+libs6rc.dylib.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_set_compile.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
 s6-rc-repo-init: EXTRA_LIBS :=
 s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RC} -lskarnet
 s6-rc-set-copy: EXTRA_LIBS :=
diff --git a/src/include/s6-rc/repo.h b/src/include/s6-rc/repo.h
index 9058943..8927efe 100644
--- a/src/include/s6-rc/repo.h
+++ b/src/include/s6-rc/repo.h
@@ -6,7 +6,10 @@
 #include <stddef.h>
 
 extern int s6rc_repo_cleanup (char const *) ;
-extern int s6rc_repo_sync (char const *, char const *const *, size_t, unsigned int) ;
+extern int s6rc_repo_sync (char const *, char const *const *, size_t, unsigned int, char const *) ;
 extern int s6rc_repo_lock (char const *, int) ;
 
+#define S6RC_REPO_SET_COMPILE_BUFLEN(repolen, setlen) ((repolen) + (setlen) + 45)
+extern int s6rc_repo_set_compile (char const *, char const *, char const *const *, size_t, char *, unsigned int, char const *) ;
+
 #endif
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index e4a3027..b57ca05 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -15,6 +15,7 @@ s6rc_lock.o
 s6rc_read_uint.o
 s6rc_repo_cleanup.o
 s6rc_repo_lock.o
+s6rc_repo_set_compile.o
 s6rc_repo_sync.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
@@ -27,3 +28,4 @@ s6rc_servicedir_unsupervise.o
 s6rc_type_check.o
 -ls6
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/libs6rc/s6rc_repo_set_compile.c b/src/libs6rc/s6rc_repo_set_compile.c
new file mode 100644
index 0000000..477549a
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_set_compile.c
@@ -0,0 +1,114 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <skalibs/posixplz.h>
+#include <skalibs/types.h>
+#include <skalibs/tai.h>
+#include <skalibs/cspawn.h>
+#include <skalibs/strerr.h>
+#include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
+
+#include <s6-rc/config.h>
+#include <s6-rc/repo.h>
+
+int s6rc_repo_set_compile (char const *repo, char const *set, char const *const *subs, size_t nsubs, char *oldc, unsigned int verbosity, char const *fdhuser)
+{
+  size_t repolen = strlen(repo) ;
+  size_t setlen = strlen(repo) ;
+  size_t totsublen = 0 ;
+  char newc[S6RC_REPO_SET_COMPILE_BUFLEN(repolen, setlen)] ;
+  memcpy(newc, repo, repolen) ;
+  memcpy(newc + repolen, "/compiled/.", 11) ;
+  memcpy(newc + repolen + 11, set, setlen) ;
+  newc[repolen + 11 + setlen] = ':' ;
+  timestamp_g(newc + repolen + 12 + setlen) ;
+  memcpy(newc + repolen + 37 + setlen, ":XXXXXX", 8) ;
+  memcpy(oldc, newc, repolen + 10) ;
+  if (mkntemp(newc) == -1) { strerr_warnfu2sys("mkntemp ", newc) ; return -1 ; }
+  for (size_t i = 0 ; i < nsubs ; i++) totsublen += strlen(subs[i]) + 1 ;
+
+  {
+    pid_t pid ;
+    size_t m = 0 ;
+    int wstat ;
+    char const *argv[9 + nsubs + !nsubs] ;
+    char fmtv[UINT_FMT] ;
+    char src[(nsubs + !nsubs) * (repolen + 10 + setlen) + totsublen] ;
+    char *w = src ;
+    fmtv[uint_fmt(fmtv, verbosity)] = 0 ;
+    argv[m++] = S6RC_BINPREFIX "s6-rc-compile" ;
+    argv[m++] = "-v";
+    argv[m++] = fmtv ;
+    argv[m++] = "-b" ;
+    if (fdhuser)
+    {
+      argv[m++] = "-h" ;
+      argv[m++] = fdhuser ;
+    }
+    argv[m++] = "--" ;
+    argv[m++] = newc ;
+    if (nsubs)
+    {
+      for (size_t i = 0 ; i < nsubs ; i++)
+      {
+        size_t sublen = strlen(subs[i]) ;
+        argv[m++] = w ;
+        memcpy(w, repo, repolen) ; w += repolen ;
+        memcpy(w, "/sources/", 9) ; w += 9 ;
+        memcpy(w, set, setlen) ; w += setlen ;
+        *w++ = '/' ;
+        memcpy(w, subs[i], sublen+1) ; w += sublen + 1 ;
+      }
+    }
+    else
+    {
+      argv[m++] = w ;
+      memcpy(w, repo, repolen) ; w += repolen ;
+      memcpy(w, "/sources/", 9) ; w += 9 ;
+      memcpy(w, set, setlen+1) ; w += setlen+1 ;
+    }
+    argv[m++] = 0 ;
+    pid = cspawn(argv[0], argv, (char const *const *)environ, 0, 0, 0) ;
+    if (!pid) { strerr_warnfu2sys("spawn ", argv[0]) ; return -1 ; }
+    if (wait_pid(pid, &wstat) == -1)
+    {
+      strerr_warnfu2sys("wait for ", argv[0]) ;
+      return -1 ;
+    }
+    if (WIFSIGNALED(wstat))
+    {
+      char fmt[UINT_FMT] ;
+      fmt[uint_fmt(fmt, WTERMSIG(wstat))] = 0 ;
+      strerr_warnf3x(argv[0], " crashed with signal ", fmt) ;
+      return -1 ;
+    }
+    if (WEXITSTATUS(wstat))
+    {
+      char fmt[UINT_FMT] ;
+      fmt[uint_fmt(fmt, WEXITSTATUS(wstat))] = 0 ;
+      strerr_warnf3x(argv[0], " exited with code ", fmt) ;
+      return (WEXITSTATUS(wstat) == 1) - 1 ;
+    }
+  }
+  {
+    char fn[repolen + setlen + 11] ;
+    memcpy(fn, newc, repolen + 10) ;
+    memcpy(fn + repolen + 10, set, setlen + 1) ;
+    if (!atomic_symlink4(newc + repolen + 10, fn, oldc + repolen + 10, repolen + setlen + 45))
+    {
+      int e = errno ;
+      rm_rf(newc) ;
+      errno = e ;
+      strerr_warnfu4sys("atomically make a ", fn, " symlink pointing to ", newc + repolen + 10) ;
+      return -1 ;
+    }
+  }
+  return 1 + !!oldc[repolen + 10] ;
+}
diff --git a/src/libs6rc/s6rc_repo_sync.c b/src/libs6rc/s6rc_repo_sync.c
index 1fb8d65..4341bee 100644
--- a/src/libs6rc/s6rc_repo_sync.c
+++ b/src/libs6rc/s6rc_repo_sync.c
@@ -24,13 +24,13 @@ static inline void cleanup (char const *fn)
   errno = e ;
 }
 
-int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sourceslen, unsigned int verbosity)
+int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sourceslen, unsigned int verbosity, char const *fdhuser)
 {
   stralloc sa = STRALLOC_ZERO ;
   size_t repolen = strlen(repo) ;
-  char newdir[repolen + 24] ;
+  char newdir[repolen + 29] ;
   memcpy(newdir, repo, repolen) ;
-  memcpy(newdir + repolen, "/.everything:cur:XXXXXX", 24) ;
+  memcpy(newdir + repolen, "/sources/..everything:XXXXXX", 29) ;
   if (!mkdtemp(newdir))
   {
     strerr_warnfu2sys("mkdtemp ", newdir) ;
@@ -56,11 +56,11 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
       if (d->d_name[0] == '.') continue ;
       len = strlen(d->d_name) ;
       {
-        char dst[repolen + 25 + len] ;
+        char dst[repolen + 30 + len] ;
         char src[srclen + len + 2] ;
-        memcpy(dst, newdir, repolen + 23) ;
-        dst[repolen + 23] = '/' ;
-        memcpy(dst + repolen + 24, d->d_name, len+1) ;
+        memcpy(dst, newdir, repolen + 28) ;
+        dst[repolen + 28] = '/' ;
+        memcpy(dst + repolen + 29, d->d_name, len+1) ;
         memcpy(src, sources[i], srclen) ;
         src[srclen] = '/' ;
         memcpy(src + srclen + 1, d->d_name, len+1) ;
@@ -116,17 +116,28 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
   }
 
   {
-    char curdir[repolen + 13] ;
+    char curdir[repolen + 21] ;
     memcpy(curdir, repo, repolen) ;
-    memcpy(curdir + repolen, "/.everything", 13) ;
-    if (!atomic_symlink(newdir + repolen + 1, curdir, "tmp")) goto err ;
+    memcpy(curdir + repolen, "/sources/.everything", 21) ;
+    if (!atomic_symlink4(newdir + repolen + 1, curdir, 0, 0)) goto err ;
   }
 
   stralloc_free(&sa) ;
-  return s6rc_repo_cleanup(repo) ;
+  if (!s6rc_repo_cleanup(repo)) return 0 ;
+
+  {
+    size_t buflen = S6RC_REPO_SET_COMPILE_BUFLEN(repolen, sizeof(".everything") - 1) ;
+    char oldc[buflen] ;
+    int r = s6rc_repo_set_compile(repo, ".everything", 0, 0, oldc, verbosity, fdhuser) ;
+    if (r <= 0) goto err0 ;
+    if (r == 2) rm_rf(oldc) ;
+  }
+
+  return 1 ;
 
  err:
   stralloc_free(&sa) ;
+ err0:
   cleanup(newdir) ;
   return 0 ;
 }
diff --git a/src/repo/DESIGN.txt b/src/repo/DESIGN.txt
index 9dbe7b2..990e573 100644
--- a/src/repo/DESIGN.txt
+++ b/src/repo/DESIGN.txt
@@ -5,7 +5,8 @@ compiled/$name-$stamp
 compiled/$name-current ->
 compiled/$name-previous ->
 
-source/.everything
-source/$name
-source/$name/active
-source/$name/masked
+sources/.everything
+sources/$name -> sources/.$name:XXXXXX
+sources/$name/active
+sources/$name/masked
+sources/$name/onboot
diff --git a/src/repo/s6-rc-repo-init.c b/src/repo/s6-rc-repo-init.c
index 2b607f1..7cc1c70 100644
--- a/src/repo/s6-rc-repo-init.c
+++ b/src/repo/s6-rc-repo-init.c
@@ -20,7 +20,7 @@
 #include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
-#define USAGE "s6-rc-repo-init [ -v verbosity ] [ -r repo ] sources..."
+#define USAGE "s6-rc-repo-init [ -v verbosity ] [ -r repo ] [ -h fdhuser ] sources..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
 static void cleanup (char const *fn)
@@ -45,13 +45,15 @@ enum gola_e
 {
   GOLA_VERBOSITY,
   GOLA_REPODIR,
+  GOLA_FDHUSER,
   GOLA_N
 } ;
 
-static gol_arg const rgola[2] =
+static gol_arg const rgola[3] =
 {
   { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
-  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR }
+  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR },
+  { .so = 'h', .lo = "fdhuser", .i = GOLA_FDHUSER }
 } ;
 
 int main (int argc, char const *const *argv)
@@ -60,12 +62,12 @@ int main (int argc, char const *const *argv)
   char const *repo = S6RC_REPO_BASE ;
   unsigned int verbosity = 1 ;
   mode_t m ;
-  char const *wgola[2] = { 0 } ;
+  char const *wgola[3] = { 0 } ;
   uint64_t wgolb = 0 ;
   unsigned int golc ;
 
   PROG = "s6-rc-repo-init" ;
-  golc = gol_main(argc, argv, rgolb, 1, rgola, 2, &wgolb, wgola) ;
+  golc = gol_main(argc, argv, rgolb, 1, rgola, 3, &wgolb, wgola) ;
   argc -= golc ; argv += golc ;
   if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity))
     strerr_dief1x(100, "verbosity needs to be an unsigned integer") ;
@@ -121,7 +123,7 @@ int main (int argc, char const *const *argv)
     strerr_diefu2sys(111, "create ", tmp) ;
   }
 
-  if (!s6rc_repo_sync(repotmp, argv, argc, verbosity))
+  if (!s6rc_repo_sync(repotmp, argv, argc, verbosity, wgola[GOLA_FDHUSER]))
   {
     cleanup(repotmp) ;
     return 111 ;
diff --git a/src/repo/s6-rc-set-copy.c b/src/repo/s6-rc-set-copy.c
index b084c7d..a76a32c 100644
--- a/src/repo/s6-rc-set-copy.c
+++ b/src/repo/s6-rc-set-copy.c
@@ -4,18 +4,47 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <skalibs/uint64.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/prog.h>
 #include <skalibs/strerr.h>
 #include <skalibs/gol.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
 
 #include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
-#define USAGE "s6-rc-set-copy [ -v verbosity ] [ -r repo ] srcset dstset"
+#define USAGE "s6-rc-set-copy [ -v verbosity ] [ -r repo ] [ -f ] srcset dstset"
 #define dieusage() strerr_dieusage(100, USAGE)
 
+enum golb_e
+{
+  GOLB_FORCE,
+  GOLB_N
+} ;
+
+enum gola_e
+{
+  GOLA_VERBOSITY,
+  GOLA_REPODIR,
+  GOLA_N
+} ;
+
+static gol_bool const rgolb[1] =
+{
+  { .so = 'f', .lo = "force", .clear = 0, .set = 1 << GOLB_FORCE }
+} ;
+
+static gol_arg const rgola[2] =
+{
+  { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
+  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR }
+} ;
+
+
+static uint64_t wgolb = 0 ;
+
 static void cleanup (char const *fn)
 {
   int e = errno ;
@@ -28,38 +57,53 @@ static inline void docopy (char const *repo, char const *srcname, char const *ds
   size_t repolen = strlen(repo) ;
   size_t srclen = strlen(srcname) ;
   size_t dstlen = strlen(dstname) ;
+  size_t r ;
   char src[repolen + srclen + 10] ;
   char dst[repolen + dstlen + 10] ;
+  char realsrc[repolen + srclen + 18] ;
+  char realdst[repolen + dstlen + 18] ;
+  char olddst[repolen + dstlen + 18] ;
   memcpy(src, repo, repolen) ;
   memcpy(src + repolen, "/sources/", 9) ;
   memcpy(src + repolen + 9, srcname, srclen + 1) ;
   memcpy(dst, src, repolen + 9) ;
   memcpy(dst + repolen + 9, dstname, dstlen + 1) ;
+  olddst[0] = 0 ;
   if (access(dst, F_OK) == -1)
   {
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", dst) ;
   }
+  else if (wgolb & (1 << GOLB_FORCE))
+  {
+    memcpy(olddst, dst, repolen + 9) ;
+    r = readlink(dst, olddst + repolen + 9, dstlen + 9) ;
+    if (r == -1) strerr_diefu2sys(111, "readlink ", dst) ;
+    if (r != dstlen + 8) strerr_dief3x(102, "symlink ", dst, "doesn't point to a valid name") ;
+  }
   else strerr_dief4x(100, "set ", dstname, " already exists in repository ", repo) ;
-  if (!hiercopy(src, dst))
+
+  memcpy(realsrc, src, repolen + 9) ;
+  r = readlink(src, realsrc + repolen + 9, srclen + 9) ;
+  if (r == -1) strerr_diefu2sys(111, "readlink ", src) ;
+  if (r != srclen + 8) strerr_dief3x(102, "symlink ", src, "doesn't point to a valid name") ;
+  realsrc[repolen + srclen + 17] = 0 ;
+  memcpy(realdst, dst, repolen + 9) ;
+  dst[repolen + 9] = '.' ;
+  memcpy(realdst + repolen + 10, dstname, dstlen) ;
+  memcpy(realdst + repolen + 10 + dstlen, realsrc + repolen + 10 + srclen, 8) ;
+  if (!hiercopy(realsrc, realdst))
+  {
+    cleanup(realdst) ;
+    strerr_diefu4sys(111, "copy ", realsrc, " to ", realdst) ;
+  }
+  if (!atomic_symlink4(realdst + repolen + 9, dst, 0, 0))
   {
-    cleanup(dst) ;
-    strerr_diefu4sys(111, "copy ", src, " to ", dst) ;
+    cleanup(realdst) ;
+    strerr_diefu4sys(111, "symlink ", realdst + repolen + 9, " to ", dst) ;
   }
+  if (olddst[0]) cleanup(olddst) ;
 }
 
-enum gola_e
-{
-  GOLA_VERBOSITY,
-  GOLA_REPODIR,
-  GOLA_N
-} ;
-
-static gol_arg const rgola[2] =
-{
-  { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
-  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR }
-} ;
-
 int main (int argc, char const *const *argv)
 {
   char const *repo = S6RC_REPO_BASE ;
@@ -69,7 +113,7 @@ int main (int argc, char const *const *argv)
   unsigned int golc ;
 
   PROG = "s6-rc-set-copy" ;
-  golc = gol_main(argc, argv, 0, 0, rgola, 2, 0, wgola) ;
+  golc = gol_main(argc, argv, rgolb, 1, rgola, 2, &wgolb, wgola) ;
   argc -= golc ; argv += golc ;
   if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity))
     strerr_dief1x(100, "verbosity needs to be an unsigned integer") ;
diff --git a/src/repo/s6-rc-set-delete.c b/src/repo/s6-rc-set-delete.c
index e45561f..58fe4f0 100644
--- a/src/repo/s6-rc-set-delete.c
+++ b/src/repo/s6-rc-set-delete.c
@@ -29,7 +29,19 @@ static inline void dodelete (char const *repo, char const *setname)
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
     else strerr_warnwu2sys("delete set ", setname) ;
   }
-  else rm_rf(fn) ;
+  else
+  {
+    ssize_t r ;
+    char real[repolen + setlen + 18] ;
+    memcpy(real, repo, repolen) ;
+    memcpy(real + repolen, "/sources/", 9) ;
+    r = readlink(fn, real + repolen + 9, setlen + 9) ;
+    if (r == -1) strerr_diefu2sys(111, "readlink ", fn) ;
+    else if (r != 8) strerr_dief3x(102, "symlink ", fn, " points to an invalid name") ;
+    real[repolen + setlen + 17] = 0 ;
+    if (unlink(fn) == -1) strerr_diefu2sys(111, "unlink ", fn) ;
+    rm_rf(real) ;
+  }
 }
 
 enum gola_e
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
index b2ce315..1a56b9d 100644
--- a/src/repo/s6-rc-set-new.c
+++ b/src/repo/s6-rc-set-new.c
@@ -34,63 +34,88 @@ static inline void newset (char const *repo, char const *setname)
 {
   size_t repolen = strlen(repo) ;
   size_t setlen = strlen(setname) ;
-  char everything[repolen + 13] ;
+  char everything[repolen + 21] ;
   char fn[repolen + 10 + setlen] ;
-  char tmp[repolen + 21 + setlen] ;
-  char cur[repolen + 28 + setlen] ;
+  char tmp[repolen + 18 + setlen] ;
+  char act[repolen + 25 + setlen] ;
+  char onb[repolen + 25 + setlen] ;
   memcpy(everything, repo, repolen) ;
-  memcpy(everything + repolen, "/.everything", 13) ;
-  memcpy(fn, repo, repolen) ;
-  memcpy(fn + repolen, "/sources/", 9) ;
+  memcpy(everything + repolen, "/sources/.everything", 21) ;
+  memcpy(fn, everything, repolen + 9) ;
   memcpy(fn + repolen + 9, setname, setlen + 1) ;
   if (access(fn, F_OK) == -1)
   {
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
   }
   else strerr_dief4x(100, "set ", setname, " already exists in repository ", repo) ;
-  memcpy(tmp, fn, repolen + 9 + setlen) ;
-  memcpy(tmp + repolen + 9 + setlen, ":tmp:XXXXXX", 12) ;
+  memcpy(tmp, fn, repolen + 9) ;
+  tmp[repolen + 9] = '.' ;
+  memcpy(tmp + repolen + 10, setname, setlen) ;
+  memcpy(tmp + repolen + 10 + setlen, ":XXXXXX", 8) ;
   if (!mkdtemp(tmp)) strerr_diefu2sys(111, "mkdtemp ", tmp) ;
 
-  memcpy(cur, tmp, repolen + 20 + setlen) ;
-  memcpy(cur + repolen + 20 + setlen, "/lock", 6) ;
-  if (!openwritenclose_unsafe(cur, "", 0))
+  memcpy(act, tmp, repolen + 17 + setlen) ;
+  memcpy(act + repolen + 17 + setlen, "/lock", 6) ;
+  if (!openwritenclose_unsafe(act, "", 0))
   {
     cleanup(tmp) ;
-    strerr_diefu2sys(111, "create ", cur) ;
+    strerr_diefu2sys(111, "create ", act) ;
   }
 
-  memcpy(cur + repolen + 21 + setlen, "masked", 7) ;
-  if (mkdir(cur, 02755) == -1)
+  memcpy(act + repolen + 18 + setlen, "masked", 7) ;
+  if (mkdir(act, 02755) == -1)
   {
     cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", cur) ;
+    strerr_diefu2sys(111, "mkdir ", act) ;
   }
 
-  memcpy(cur + repolen + 21 + setlen, "active", 7) ;
-  if (mkdir(cur, 02755) == -1)
+  memcpy(act + repolen + 18 + setlen, "onboot", 7) ;
+  if (mkdir(act, 02755) == -1)
   {
     cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", cur) ;
+    strerr_diefu2sys(111, "mkdir ", act) ;
+  }
+  memcpy(onb, act, repolen + 25 + setlen) ;
+
+  memcpy(act + repolen + 18 + setlen, "active", 7) ;
+  if (mkdir(act, 02755) == -1)
+  {
+    cleanup(tmp) ;
+    strerr_diefu2sys(111, "mkdir ", act) ;
   }
 
   DIR *dir = opendir(everything) ;
   for (;;)
   {
+    char *cur = act ;
     size_t len ;
     direntry *d ;
     errno = 0 ;
     d = readdir(dir) ;
     if (!d) break ;
     if (d->d_name[0] == '.') continue ;
+
     len = strlen(d->d_name) ;
-    char src[19 + len] ;
-    char dst[repolen + 29 + setlen + len] ;
-    memcpy(src, "../../.everything/", 18) ;
-    memcpy(src + 18, d->d_name, len+1) ;
-    memcpy(dst, cur, repolen + 27 + setlen) ;
-    dst[repolen + 27 + setlen] = '/' ;
-    memcpy(dst + repolen + 28 + setlen, d->d_name, len+1) ;
+    char src[len + 33] ;
+    char dst[repolen + 26 + setlen + len] ;
+    memcpy(src, "../.everything/", 15) ;
+    memcpy(src + 15, d->d_name, len) ;
+    memcpy(src + 15 + len, "/flag-essential", 16) ;
+    if (access(src, F_OK) == -1)
+    {
+      if (errno != ENOENT) strerr_diefu2sys(111, "access ", src) ;
+    }
+    else cur = onb ;
+    memcpy(src + 21 + len, "recommended", 12) ;
+    if (access(src, F_OK) == -1)
+    {
+      if (errno != ENOENT) strerr_diefu2sys(111, "access ", src) ;
+    }
+    else cur = onb ;
+    src[15 + len] = 0 ;
+    memcpy(dst, cur, repolen + 24 + setlen) ;
+    dst[repolen + 24 + setlen] = '/' ;
+    memcpy(dst + repolen + 25 + setlen, d->d_name, len+1) ;
     if (symlink(src, dst) == -1)
     {
       cleanup(tmp) ;
@@ -109,7 +134,7 @@ static inline void newset (char const *repo, char const *setname)
     cleanup(tmp) ;
     strerr_diefu2sys(111, "chmod ", tmp) ;
   }
-  if (rename(tmp, fn) == -1)
+  if (symlink(tmp, fn) == -1)
   {
     cleanup(tmp) ;
     strerr_diefu4sys(111, "rename ", tmp, " to ", fn) ;
@@ -145,8 +170,12 @@ int main (int argc, char const *const *argv)
   if (wgola[GOLA_REPODIR]) repo = wgola[GOLA_REPODIR] ;
   if (!argc) dieusage() ;
   for (unsigned int i = 0 ; i < argc ; i++)
+  {
+    if (!argv[i][0]) strerr_dief1x(100, "set names cannot be empty") ;
+    if (argv[i][0] == '.') strerr_dief1x(100, "set names cannot start with a dot") ;
     if (strchr(argv[i], '/') || strchr(argv[i], '\n'))
       strerr_dief1x(100, "set names cannot contain / or newlines") ;
+  }
 
   fdlock = s6rc_repo_lock(repo, 1) ;
   if (fdlock == -1) strerr_diefu2sys(111, "lock ", repo) ;
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index f4b7291..4e390ac 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -387,6 +387,7 @@ static uint32_t read_flags (int dfd, char const *srcdir, char const *name)
   static char const *files[32] =
   {
     "flag-essential",
+    "flag-recommended",
     0
   } ;
   uint32_t flags = 0 ;
diff --git a/src/s6-rc/s6-rc-format-upgrade.c b/src/s6-rc/s6-rc-format-upgrade.c
index e02c161..e2db73f 100644
--- a/src/s6-rc/s6-rc-format-upgrade.c
+++ b/src/s6-rc/s6-rc-format-upgrade.c
@@ -25,8 +25,8 @@ static inline void update_livedir (char const *live, char const *newcompiled, ta
   char cfn[livelen + 10] ;
   memcpy(cfn, live, livelen) ;
   memcpy(cfn + livelen, "/compiled", 10) ;
-  if (!atomic_symlink(newcompiled, cfn, PROG))
-    strerr_diefu4sys(111, "atomic_symlink ", cfn, " to ", newcompiled) ;
+  if (!atomic_symlink4(newcompiled, cfn, 0, 0))
+    strerr_diefu4sys(111, "atomic_symlink4 ", cfn, " to ", newcompiled) ;
 }
 
 
diff --git a/src/s6-rc/s6-rc-init.c b/src/s6-rc/s6-rc-init.c
index ea52255..19b4770 100644
--- a/src/s6-rc/s6-rc-init.c
+++ b/src/s6-rc/s6-rc-init.c
@@ -115,7 +115,7 @@ int main (int argc, char const *const *argv)
       strerr_diefu4sys(111, "recursively copy ", cfn, " to ", lfn) ;
     }
   }
-  if (!atomic_symlink(sa.s + dirlen, live, PROG))
+  if (!atomic_symlink4(sa.s + dirlen, live, 0, 0))
   {
     cleanup(&sa) ;
     strerr_diefu4sys(111, "symlink ", sa.s + dirlen, " to ", live) ;
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c
index fd13f8a..1ceeba9 100644
--- a/src/s6-rc/s6-rc-update.c
+++ b/src/s6-rc/s6-rc-update.c
@@ -376,7 +376,7 @@ static inline void make_new_livedir (unsigned char const *oldstate, s6rc_db_t co
   sa->s[sa->len] = 0 ;
 
    /* The point of no return is here */
-  if (!atomic_symlink(sa->s + dirlen, live, "s6-rc-update_atomic_symlink")) goto rollback ;
+  if (!atomic_symlink4(sa->s + dirlen, live, 0, 0)) goto rollback ;
   if (verbosity >= 2) strerr_warni1x("successfully switched to new database") ;
 
  /* scandir cleanup, then old livedir cleanup */