Support bundles in changestate, various refactors

1 files changed, 24 insertions, 2 deletions

diff --git a/src/libs6rc/s6rc_repo_setcompile.c b/src/libs6rc/s6rc_repo_setcompile.c
index 82f7d02..5da136a 100644
--- a/src/libs6rc/s6rc_repo_setcompile.c
+++ b/src/libs6rc/s6rc_repo_setcompile.c
@@ -1,11 +1,33 @@
 /* ISC license. */
 
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/djbunix.h>
+
 #include <s6-rc/repo.h>
 
 int s6rc_repo_setcompile (char const *repo, char const *set, char const *defbundle, char *oldc, unsigned int verbosity, char const *fdhuser)
 {
-  static char const *const subs[4] = { "active", "onboot", "always", "bundle" } ;
+  static char const *const subs[4] = { "bundle", s6rc_repo_subnames[1], s6rc_repo_subnames[2], s6rc_repo_subnames[3] } ;
+  int r ;
   if (!s6rc_repo_makesetbundles(repo, set, verbosity)) return -1 ;
   if (!s6rc_repo_makedefbundle(repo, set, defbundle)) return -1 ;
-  return s6rc_repo_compile(repo, set, subs, 4, oldc, verbosity, fdhuser) ;
+  r = s6rc_repo_compile(repo, set, subs, 4, oldc, verbosity, fdhuser) ;
+
+  {
+    int e = errno ;
+    size_t repolen = strlen(repo) ;
+    size_t setlen = strlen(set) ;
+    size_t sublen = strlen(subs[0]) ;
+    char fn[repolen + setlen + 11 + sublen] ;
+    memcpy(fn, repo, repolen) ;
+    memcpy(fn + repolen, "/sources/", 9) ;
+    memcpy(fn + repolen + 9, set, setlen) ;
+    fn[repolen + 9 + setlen] = '/' ;
+    memcpy(fn + repolen + setlen + 10, subs[0], sublen + 1) ;
+    rm_rf(fn) ;
+    errno = e ;
+  }
+  return r ;
 }