From ebf148d99e2dab6135794149553c193abe4e675d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 18 Oct 2026 00:30:27 +0000 Subject: Part four: we delete all the snapshots after set-install Except the snapshot corresponding to the new live db, of course. Also, in order to accommodate snapshots without risking name conflicts, the real name of set foobar isn't .foobar:XXXXXX anymore, but .real.foobar:XXXXXX Now the automatic upgrade in case of major bump is complete. Next comes testing and debugging. --- src/repo/s6rc_repo_setdelete.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/repo/s6rc_repo_setdelete.c') diff --git a/src/repo/s6rc_repo_setdelete.c b/src/repo/s6rc_repo_setdelete.c index a372d93..605533e 100644 --- a/src/repo/s6rc_repo_setdelete.c +++ b/src/repo/s6rc_repo_setdelete.c @@ -14,7 +14,7 @@ void s6rc_repo_setdelete (char const *repo, char const *set) size_t repolen = strlen(repo) ; size_t setlen = strlen(set) ; ssize_t r ; - char real[repolen + setlen + 18] ; + char real[repolen + setlen + 22] ; char fn[repolen + setlen + 11] ; memcpy(fn, repo, repolen) ; memcpy(fn + repolen, "/sources/", 9) ; @@ -22,9 +22,9 @@ void s6rc_repo_setdelete (char const *repo, char const *set) if (access(fn, W_OK) == -1 && errno != ENOENT) return ; memcpy(real, repo, repolen) ; memcpy(real + repolen, "/sources/", 9) ; - r = readlink(fn, real + repolen + 9, setlen + 9) ; - if (r == -1 || r != setlen + 8) return ; - real[repolen + setlen + 17] = 0 ; + r = readlink(fn, real + repolen + 9, setlen + 13) ; + if (r == -1 || r != setlen + 12) return ; + real[repolen + setlen + 21] = 0 ; unlink_void(fn) ; rm_rf(real) ; } -- cgit v1.3.1