s6-rc-set-new, refactors, additions, etc.

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

14 files changed, 259 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index 0394e68..b04357a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /s6-rc-format-upgrade
 /s6-rc-repo-init
 /s6-rc-repo-populate
+/s6-rc-set-new
diff --git a/package/deps.mak b/package/deps.mak
index 88d5e01..c1d01d5 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -20,6 +20,7 @@ src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_livedir_prefixsize.lo: sr
 src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_lock.lo: src/libs6rc/s6rc_lock.c src/include/s6-rc/s6rc-utils.h
 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_sync.o src/libs6rc/s6rc_repo_sync.lo: src/libs6rc/s6rc_repo_sync.c src/include/s6-rc/repo.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
@@ -29,7 +30,9 @@ src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_internal.lo:
 src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_manage.lo: src/libs6rc/s6rc_servicedir_manage.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_unblock.lo: src/libs6rc/s6rc_servicedir_unblock.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_servicedir_unsupervise.lo: src/libs6rc/s6rc_servicedir_unsupervise.c src/include/s6-rc/s6rc-servicedir.h
+src/libs6rc/s6rc_type_check.o src/libs6rc/s6rc_type_check.lo: src/libs6rc/s6rc_type_check.c src/include/s6-rc/s6rc-utils.h
 src/repo/s6-rc-repo-init.o src/repo/s6-rc-repo-init.lo: src/repo/s6-rc-repo-init.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
+src/repo/s6-rc-set-new.o src/repo/s6-rc-set-new.lo: src/repo/s6-rc-set-new.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-bundle.o src/s6-rc/s6-rc-bundle.lo: src/s6-rc/s6-rc-bundle.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-compile.o src/s6-rc/s6-rc-compile.lo: src/s6-rc/s6-rc-compile.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-db.o src/s6-rc/s6-rc-db.lo: src/s6-rc/s6-rc-db.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
@@ -42,17 +45,19 @@ 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_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
+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
 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_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
+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
 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_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
+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_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
+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
 s6-rc-repo-init: EXTRA_LIBS :=
 s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RC} -lskarnet
+s6-rc-set-new: EXTRA_LIBS :=
+s6-rc-set-new: src/repo/s6-rc-set-new.o ${LIBS6RC} -lskarnet
 s6-rc: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
 s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -ls6 -lskarnet
 s6-rc-bundle: EXTRA_LIBS :=
diff --git a/package/targets.mak b/package/targets.mak
index 6c16a89..80ff22c 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -7,7 +7,8 @@ s6-rc-init \
 s6-rc \
 s6-rc-update \
 s6-rc-format-upgrade \
-s6-rc-repo-init
+s6-rc-repo-init \
+s6-rc-set-new
 
 LIBEXEC_TARGETS := \
 s6-rc-fdholder-filler \
diff --git a/src/include/s6-rc/repo.h b/src/include/s6-rc/repo.h
index 4ae6077..9058943 100644
--- a/src/include/s6-rc/repo.h
+++ b/src/include/s6-rc/repo.h
@@ -7,5 +7,6 @@
 
 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_lock (char const *, int) ;
 
 #endif
diff --git a/src/include/s6-rc/s6rc-utils.h b/src/include/s6-rc/s6rc-utils.h
index 84f035b..6334b96 100644
--- a/src/include/s6-rc/s6rc-utils.h
+++ b/src/include/s6-rc/s6rc-utils.h
@@ -23,4 +23,6 @@ extern int s6rc_livedir_canon (char const **) ;
 extern int s6rc_live_state_size (char const *, uint32_t *, uint32_t *) ;
 extern int s6rc_live_state_read (char const *, unsigned char *, uint32_t) ;
 
+extern int s6rc_type_check (int, char const *) ;
+
 #endif
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 71a1616..e4a3027 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -14,6 +14,7 @@ s6rc_livedir_prefixsize.o
 s6rc_lock.o
 s6rc_read_uint.o
 s6rc_repo_cleanup.o
+s6rc_repo_lock.o
 s6rc_repo_sync.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
@@ -23,5 +24,6 @@ s6rc_servicedir_copy_offline.o
 s6rc_servicedir_copy_online.o
 s6rc_servicedir_manage.o
 s6rc_servicedir_unsupervise.o
+s6rc_type_check.o
 -ls6
 -lskarnet
diff --git a/src/libs6rc/s6rc_repo_cleanup.c b/src/libs6rc/s6rc_repo_cleanup.c
index 9b42c06..d64fe83 100644
--- a/src/libs6rc/s6rc_repo_cleanup.c
+++ b/src/libs6rc/s6rc_repo_cleanup.c
@@ -51,8 +51,12 @@ static inline int sub_cleanup (char const *subdir)
 
 int s6rc_repo_cleanup (char const *repo)
 {
+  DIR *dir ;
   size_t repolen = strlen(repo) ;
-  DIR *dir = opendir(repo) ;
+  char sources[repolen + 9] ;
+  memcpy(sources, repo, repolen) ;
+  memcpy(sources + repolen, "/sources", 9) ;
+  dir = opendir(sources) ;
   if (!dir) return 0 ;
   for (;;)
   {
@@ -64,10 +68,10 @@ int s6rc_repo_cleanup (char const *repo)
     if (d->d_name[0] == '.') continue ;
     len = strlen(d->d_name) ;
     {
-      char fn[repolen + len + 2] ;
-      memcpy(fn, repo, repolen) ;
-      fn[repolen] = '/' ;
-      memcpy(fn + repolen + 1, d->d_name, len + 1) ;
+      char fn[repolen + len + 10] ;
+      memcpy(fn, sources, repolen + 8) ;
+      fn[repolen + 8] = '/' ;
+      memcpy(fn + repolen + 9, d->d_name, len + 1) ;
       if (!sub_cleanup(fn)) break ;
     }
   }
diff --git a/src/libs6rc/s6rc_repo_lock.c b/src/libs6rc/s6rc_repo_lock.c
new file mode 100644
index 0000000..472ff15
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_lock.c
@@ -0,0 +1,20 @@
+/* ISC license. */
+
+#include <string.h>
+
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_lock (char const *repo, int w)
+{
+  int fd ;
+  size_t repolen = strlen(repo) ;
+  char fn[repolen + 13] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/lock", 6) ;
+  fd = openc_write(fn) ;
+  if (fd == -1) return -1 ;
+  if (fd_lock(fd, w, 0) < 1) return -1 ;
+  return fd ;
+}
diff --git a/src/libs6rc/s6rc_repo_sync.c b/src/libs6rc/s6rc_repo_sync.c
index 963ec3c..1fb8d65 100644
--- a/src/libs6rc/s6rc_repo_sync.c
+++ b/src/libs6rc/s6rc_repo_sync.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/bsdsnowflake.h>  /* stat */
 #include <skalibs/nonposix.h>  /* mkdtemp */
 
 #include <string.h>
@@ -8,7 +7,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <skalibs/stat.h>
 #include <skalibs/direntry.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/strerr.h>
@@ -16,6 +14,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
 
+#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 static inline void cleanup (char const *fn)
@@ -57,25 +56,27 @@ 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) ;
       {
-        struct stat st ;
         char dst[repolen + 25 + 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 + repolen + 24, d->d_name, len+1) ;
         memcpy(src, sources[i], srclen) ;
         src[srclen] = '/' ;
-        memcpy(src + srclen + 1, d->d_name, len + 1) ;
-        if (stat(src, &st) == -1)
+        memcpy(src + srclen + 1, d->d_name, len+1) ;
+        switch (s6rc_type_check(-1, src))
         {
-          if (verbosity) strerr_warnwu2sys("stat ", src) ;
-          continue ;
-        }
-        if (!S_ISDIR(st.st_mode))
-        {
-          errno = ENOTDIR ;
-          if (verbosity) strerr_warnwu2sys("link ", src) ;
-          continue ;
+          case 1 :
+          case 2 :
+          case 3 : break ;
+          case 0 :
+            strerr_warnf2x("invalid service type for ", src) ;
+            dir_close(dir) ;
+            goto err ;
+          default :
+            strerr_warnfu2sys("check service type of ", src) ;
+            dir_close(dir) ;
+            goto err ;
         }
         if (symlink(src, dst) == -1)
         {
@@ -110,6 +111,7 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
 
   if (chmod(newdir, 02755) == -1)
   {
+    strerr_warnfu2sys("chmod ", newdir) ;
     goto err ;
   }
 
diff --git a/src/libs6rc/s6rc_type_check.c b/src/libs6rc/s6rc_type_check.c
new file mode 100644
index 0000000..9ce84b9
--- /dev/null
+++ b/src/libs6rc/s6rc_type_check.c
@@ -0,0 +1,33 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
+
+#include <s6-rc/s6rc-utils.h>
+
+int s6rc_type_check (int dfd, char const *src)
+{
+  char type[8] ;
+  ssize_t r ;
+  if (dfd >= 0) r = openreadnclose_at(dfd, "type", type, 8) ;
+  else
+  {
+    size_t srclen = strlen(src) ;
+    char fn[srclen + 6] ;
+    memcpy(fn, src, srclen) ;
+    memcpy(fn + srclen, "/type", 6) ;
+    r = openreadnclose(fn, type, 8) ;
+  }
+  if (r == -1) return -1 ;
+  if (r < 6) return 0 ;
+  if (type[r-1] == '\n') r-- ;
+  if (r == 8) return 0 ;
+  type[r++] = 0 ;
+  return
+    !strcmp(type, "longrun") ? 1 :
+    !strcmp(type, "oneshot") ? 2 :
+    !strcmp(type, "bundle")  ? 3 : 0 ;
+}
diff --git a/src/repo/deps-exe/s6-rc-set-new b/src/repo/deps-exe/s6-rc-set-new
new file mode 100644
index 0000000..152b051
--- /dev/null
+++ b/src/repo/deps-exe/s6-rc-set-new
@@ -0,0 +1,2 @@
+${LIBS6RC}
+-lskarnet
diff --git a/src/repo/s6-rc-repo-init.c b/src/repo/s6-rc-repo-init.c
index 6a321c8..584d079 100644
--- a/src/repo/s6-rc-repo-init.c
+++ b/src/repo/s6-rc-repo-init.c
@@ -70,8 +70,6 @@ int main (int argc, char const *const *argv)
   if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity))
     strerr_dief1x(100, "verbosity needs to be an unsigned integer") ;
   if (wgola[GOLA_REPODIR]) repo = wgola[GOLA_REPODIR] ;
-  if (repo[0] != '/')
-    strerr_dief2x(100, repo, " is not an absolute path") ;
   for (unsigned int i = 0 ; i < argc ; i++)
     if (argv[i][0] != '/')
       strerr_dief2x(100, argv[i], " is not an absolute path") ;
@@ -107,7 +105,7 @@ int main (int argc, char const *const *argv)
     strerr_diefu2sys(111, "mkdir ", tmp) ;
   }
 
-  memcpy(tmp + repolen + 12, "source", 7) ;
+  memcpy(tmp + repolen + 12, "sources", 8) ;
   if (mkdir(tmp, 02755) == -1)
   {
     cleanup(repotmp) ;
@@ -116,6 +114,13 @@ int main (int argc, char const *const *argv)
 
   umask(m) ;
 
+  memcpy(tmp + repolen + 12, "lock", 5) ;
+  if (!openwritenclose_unsafe5(tmp, "", 0, 0, 0))
+  {
+    cleanup(repotmp) ;
+    strerr_diefu2sys(111, "create ", tmp) ;
+  }
+
   if (!s6rc_repo_sync(repotmp, argv, argc, verbosity))
   {
     cleanup(repotmp) ;
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
new file mode 100644
index 0000000..9dddce6
--- /dev/null
+++ b/src/repo/s6-rc-set-new.c
@@ -0,0 +1,148 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>  /* stat */
+#include <skalibs/nonposix.h>  /* mkdtemp */
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>  /* rename */
+#include <errno.h>
+
+#include <skalibs/stat.h>
+#include <skalibs/posixplz.h>
+#include <skalibs/gol.h>
+#include <skalibs/prog.h>
+#include <skalibs/strerr.h>
+#include <skalibs/direntry.h>
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/config.h>
+#include <s6-rc/s6rc.h>
+
+#define USAGE "s6-rc-set-new [ -v verbosity ] [ -r repo ] setname..."
+#define dieusage() strerr_dieusage(100, USAGE)
+
+static void cleanup (char const *fn)
+{
+  int e = errno ;
+  rm_rf(fn) ;
+  errno = e ;
+}
+
+static inline void newset (char const *repo, size_t repolen, char const *everything, char const *setname)
+{
+  size_t setlen = strlen(setname) ;
+  DIR *dir ;
+  char fn[repolen + 10 + setlen] ;
+  char tmp[repolen + 21 + setlen] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/sources/", 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) ;
+  if (!mkdtemp(tmp)) strerr_diefu2sys(111, "mkdtemp ", tmp) ;
+  dir = opendir(everything) ;
+  for (;;)
+  {
+    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[16 + len] ;
+    char dst[repolen + 22 + setlen + len] ;
+    memcpy(src, "../.everything/", 15) ;
+    memcpy(src + 15, d->d_name, len+1) ;
+    memcpy(dst, tmp, repolen + 20 + setlen) ;
+    dst[repolen + 20 + setlen] = '/' ;
+    memcpy(dst + repolen + 21 + setlen, d->d_name, len+1) ;
+    if (symlink(src, dst) == -1)
+    {
+      cleanup(tmp) ;
+      strerr_diefu4sys(111, "symlink ", src, " to ", dst) ;
+    }
+  }
+  dir_close(dir) ;
+  if (errno)
+  {
+    cleanup(tmp) ;
+    strerr_diefu2sys(111, "readdir ", tmp) ;
+  }
+
+  if (chmod(tmp, 02755) == -1)
+  {
+    cleanup(tmp) ;
+    strerr_diefu2sys(111, "chmod ", tmp) ;
+  }
+  if (rename(tmp, fn) == -1)
+  {
+    cleanup(tmp) ;
+    strerr_diefu4sys(111, "rename ", tmp, " to ", fn) ;
+  }
+}
+
+enum golb_e
+{
+  GOLB_FORCE,
+  GOLB_N
+} ;
+
+static gol_bool const rgolb[1] =
+{
+  { .so = 'f', .lo = "force", .clear = 0, .set = 1 << GOLB_FORCE }
+} ;
+
+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)
+{
+  size_t repolen ;
+  char const *repo = S6RC_REPO_BASE ;
+  int fdlock ;
+  unsigned int verbosity = 1 ;
+  char const *wgola[2] = { 0 } ;
+  uint64_t wgolb = 0 ;
+  unsigned int golc ;
+
+  PROG = "s6-rc-set-new" ;
+  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") ;
+  if (wgola[GOLA_REPODIR]) repo = wgola[GOLA_REPODIR] ;
+  if (!argc) dieusage() ;
+  for (unsigned int i = 0 ; i < argc ; i++)
+    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) ;
+
+  repolen = strlen(repo) ;
+  char fn[repolen + 13] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/.everything", 13) ;
+  for (unsigned int i = 0 ; i < argc ; i++)
+    newset(repo, repolen, fn, argv[i]) ;
+
+  return 0 ;
+}
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index e9a1b76..f4b7291 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -527,21 +527,15 @@ static inline void add_bundle (before_t *be, int dfd, char const *srcdir, char c
 
 static inline void add_source (before_t *be, int dfd, char const *srcdir, char const *name)
 {
-  char typestr[8] = "" ;
-  ssize_t r ;
   if (verbosity >= 2) strerr_warni4x("parsing ", srcdir, "/", name) ;
-  r = openreadnclose_at(dfd, "type", typestr, 8) ;
-  if (r == -1)
+  switch (s6rc_type_check(dfd, 0))
   {
-    if (!errno) errno = EINVAL ;
-    strerr_diefu5sys(111, "read ", srcdir, "/", name, "/type") ;
+    case 0 : strerr_dief6x(1, "invalid ", srcdir, "/", name, "/type", ": must be oneshot, longrun, or bundle") ;
+    case 1 : add_longrun(be, dfd, srcdir, name) ; break ;
+    case 2 : add_oneshot(be, dfd, srcdir, name) ; break ;
+    case 3 : add_bundle(be, dfd, srcdir, name) ; break ;
+    default : strerr_diefu5sys(111, "read ", srcdir, "/", name, "/type") ;
   }
-  if (typestr[r-1] == '\n') r-- ;
-  typestr[r++] = 0 ;
-  if (!strcmp(typestr, "oneshot")) add_oneshot(be, dfd, srcdir, name) ;
-  else if (!strcmp(typestr, "longrun")) add_longrun(be, dfd, srcdir, name) ;
-  else if (!strcmp(typestr, "bundle")) add_bundle(be, dfd, srcdir, name) ;
-  else strerr_dief6x(1, "invalid ", srcdir, "/", name, "/type", ": must be oneshot, longrun, or bundle") ;
 }
 
 static int qsort_cannot_use_strcmp_directly (void const *a, void const *b)