From 399184cad0c0dd63a39de775130a2a73d0325913 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 5 Oct 2025 00:05:59 +0000
Subject:  Do not delete old store before the sync succeeds

---
 src/repo/DESIGN.txt        | 12 ------------
 src/repo/s6-rc-repo-init.c | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 src/repo/DESIGN.txt

(limited to 'src/repo')

diff --git a/src/repo/DESIGN.txt b/src/repo/DESIGN.txt
deleted file mode 100644
index 990e573..0000000
--- a/src/repo/DESIGN.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/var/lib/s6-rc/repository: base
-
-compiled/$name-$stamp
-compiled/$name-current ->
-compiled/$name-previous ->
-
-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 b105200..335d83f 100644
--- a/src/repo/s6-rc-repo-init.c
+++ b/src/repo/s6-rc-repo-init.c
@@ -18,6 +18,7 @@
 #include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/random.h>
+#include <skalibs/unix-transactional.h>
 
 #include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
@@ -180,13 +181,29 @@ int main (int argc, char const *const *argv)
   if (lockfd == -1)
     strerr_diefu2sys(111, "lock ", wgola[GOLA_REPODIR]) ;
 
-  if (!s6rc_repo_makestores(wgola[GOLA_REPODIR], argv, argc)) _exit(111) ;
+  char sold[repolen + 16] ;
+  memcpy(sold, wgola[GOLA_REPODIR], repolen) ;
+  sold[repolen] = '/' ;
+
+  if (!s6rc_repo_makestores(wgola[GOLA_REPODIR], argv, argc, sold + repolen + 1)) _exit(111) ;
 
   if (!(wgolb & GOLB_BARE))
   {
     if (!s6rc_repo_sync(wgola[GOLA_REPODIR], verbosity, wgola[GOLA_FDHUSER]))
+    {
+      char stores[repolen + 8] ;
+      char snew[repolen + 16] ;
+      memcpy(stores, wgola[GOLA_REPODIR], repolen) ;
+      memcpy(stores + repolen, "/stores", 8) ;
+      memcpy(snew, wgola[GOLA_REPODIR], repolen) ;
+      snew[repolen] = '/' ;
+      if (!atomic_symlink4(sold + repolen + 1, stores, snew + repolen + 1, 15))
+        strerr_diefu7sys(111, "atomically switch back stores at ", wgola[GOLA_REPODIR], " - old store is ", sold + repolen + 1, " and new (invalid) store is ", snew + repolen + 1, " - reported error was") ;
+      rm_rf(snew) ;
       _exit(111) ;
+    }
   }
 
+  rm_rf(sold) ;
   _exit(0) ;
 }
-- 
cgit v1.3.1