1 files changed, 26 insertions, 15 deletions

diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index 0bfe4d7..8e9af59 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -21,7 +21,7 @@
 #include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
-#define USAGE "s6-rc-compile [ -v verbosity ] [ -h fdholder-user ] [ -L catchall-logger ] [ -b ] destdir sources..."
+#define USAGE "s6-rc-compile [ -v verbosity ] [ -h fdholder-user ] [ -L catchall-logger ] [ -D default-bundle ] [ -b ] destdir sources..."
 #define dieusage() strerr_dieusage(100, USAGE)
 #define dienomem() strerr_dief(111, "out of memory") ;
 
@@ -37,6 +37,7 @@ enum gola_e
   GOLA_VERBOSITY,
   GOLA_FDHUSER,
   GOLA_CATCHALL,
+  GOLA_DEFBUNDLE,
   GOLA_N
 } ;
 
@@ -1604,19 +1605,26 @@ static inline void write_db (char const *compiled, s6rc_db_t const *db)
   strerr_diefusys(111, "write to ", dbfn) ;
 }
 
-static inline void write_major (char const *compiled)
+static inline void write_meta (char const *compiled, char const *fdhuser, char const *catchall)
 {
-  uint32_t version = s6rc_get_major(S6RC_VERSION) ;
-  size_t len ;
-  char fmt[UINT32_FMT] ;
-  if (!version)
-  {
-    cleanup(compiled) ;
-    strerr_dief(101, "invalid software version: ", S6RC_VERSION) ;
-  }
-  len = uint32_fmt(fmt, version) ;
-  fmt[len++] = '\n' ;
-  auto_file(compiled, "major", fmt, len) ;
+  char pack[4] ;
+  char fn[19] ;
+
+  memcpy(fn, "metainfo", 9) ;
+  auto_dir(compiled, fn) ;
+
+  memcpy(fn + 8, "/major", 7) ;
+  uint32_pack_big(pack, s6rc_get_major(S6RC_VERSION)) ;
+  auto_file(compiled, fn, pack, 4) ;
+
+  memcpy(fn + 9, "fdhuser", 8) ;
+  auto_file(compiled, fn, fdhuser ? fdhuser : "", fdhuser ? strlen(fdhuser) : 0) ;
+
+  memcpy(fn + 9, "catchall", 9) ;
+  auto_file(compiled, fn, catchall ? catchall : "", catchall ? strlen(catchall) : 0) ;
+
+  memcpy(fn + 9, "defbundle", 10) ;
+  auto_file(compiled, fn, defbundle ? defbundle : "", defbundle ? strlen(defbundle) : 0) ;
 }
 
 static inline void write_compiled (
@@ -1628,11 +1636,12 @@ static inline void write_compiled (
   uint32_t const *bdeps,
   char const *fdhuser,
   char const *catchall,
+  char const *defbundle,
   int blocking)
 {
   if (verbosity >= 2) strerr_warni("writing compiled information to ", compiled) ;
   init_compiled(compiled) ;
-  write_major(compiled) ;
+  write_meta(compiled, fdhuser, catchall, defbundle) ;
   write_sizes(compiled, db) ;
   write_resolve(compiled, db, bundles, nbundles, bdeps) ;
   stralloc_free(&data) ;
@@ -1653,6 +1662,7 @@ int main (int argc, char const *const *argv)
     { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
     { .so = 'h', .lo = "fdholder-user", .i = GOLA_FDHUSER },
     { .so = 'L', .lo = "catchall-logger", .i = GOLA_CATCHALL },
+    { .so = 'D', .lo = "default-bundle", .i = GOLA_DEFBUNDLE },
   } ;
   before_t before = BEFORE_ZERO ;
   uint64_t wgolb = 0 ;
@@ -1660,6 +1670,7 @@ int main (int argc, char const *const *argv)
   char const *compiled ;
   unsigned int golc ;
   PROG = "s6-rc-compile" ;
+  wgola[GOLA_DEFBUNDLE] = S6RC_DEFBUNDLE ;
 
   golc = GOL_main(argc, argv, rgolb, rgola, &wgolb, wgola) ;
   argc -= golc ; argv += golc ;
@@ -1722,7 +1733,7 @@ int main (int argc, char const *const *argv)
       db.deps = deps ;
       flatlist_services(&db, sarray) ;
       propagate_bundle_flags(&db, bundles, nbundles, bdeps) ;
-      write_compiled(compiled, &db, srcdirs, bundles, nbundles, bdeps, wgola[GOLA_FDHUSER], wgola[GOLA_CATCHALL], wgolb & GOLB_BLOCK) ;
+      write_compiled(compiled, &db, srcdirs, bundles, nbundles, bdeps, wgola[GOLA_FDHUSER], wgola[GOLA_CATCHALL], wgola[GOLA_DEFBUNDLE], wgolb & GOLB_BLOCK) ;
     }
   }