summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL2
-rw-r--r--doc/index.html2
-rw-r--r--doc/upgrade.html2
-rw-r--r--src/libs6rc/s6rc_servicedir_internal.c2
-rw-r--r--src/s6-rc/s6-rc-compile.c8
5 files changed, 13 insertions, 3 deletions
diff --git a/INSTALL b/INSTALL
index 9cb026b..50d53aa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Build Instructions
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
- skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/
- - execline version 2.9.0.2 or later: https://skarnet.org/software/execline/
+ - execline version 2.9.1.0 or later: https://skarnet.org/software/execline/
- s6 version 2.11.2.0 or later: https://skarnet.org/software/s6/
This software will run on any operating system that implements
diff --git a/doc/index.html b/doc/index.html
index 1f7efa6..26fd80a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ scripts are also run in a controlled environment.
2.13.0.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs library. </li>
<li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.0.2 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.9.1.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
<li> <a href="//skarnet.org/software/s6/">s6</a> version
2.11.2.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
</ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index bc3780a..65433d3 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -36,7 +36,7 @@ minor and bugfix version changes.
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
dependency bumped to 2.13.0.0. </li>
<li> <a href="//skarnet.org/software/execline/">execline</a>
-dependency bumped to 2.9.0.2. </li>
+dependency bumped to 2.9.1.0. </li>
<li> <a href="//skarnet.org/software/s6/">s6</a>
dependency bumped to 2.11.2.0. </li>
</ul>
diff --git a/src/libs6rc/s6rc_servicedir_internal.c b/src/libs6rc/s6rc_servicedir_internal.c
index dfc0a44..2c2c859 100644
--- a/src/libs6rc/s6rc_servicedir_internal.c
+++ b/src/libs6rc/s6rc_servicedir_internal.c
@@ -24,6 +24,8 @@ static s6_servicedir_desc const svdir_file_list[] =
{ .name = "timeout-finish", .type = S6_FILETYPE_UINT, .options = 0 },
{ .name = "max-death-tally", .type = S6_FILETYPE_UINT, .options = 0 },
{ .name = "down-signal", .type = S6_FILETYPE_NORMAL, .options = 0 },
+ { .name = "instance", .type = S6_FILETYPE_DIR, .options = 0 },
+ { .name = "instances", .type = S6_FILETYPE_DIR, .options = 0 },
{ .name = "data", .type = S6_FILETYPE_DIR, .options = 0 },
{ .name = "env", .type = S6_FILETYPE_DIR, .options = 0 },
{ .name = 0, .options = 0 }
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index 31bf3d0..3cd9b24 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -1384,6 +1384,14 @@ static inline void write_servicedirs (char const *compiled, s6rc_db_t const *db,
memcpy(dstfn + clen + 14 + len, "down-signal", 12) ;
filecopy_unsafe(srcfn, dstfn, 0644) ;
+ memcpy(srcfn + srcdirlen + len + 2, "instance", 9) ;
+ memcpy(dstfn + clen + 14 + len, "instance", 9) ;
+ dircopy(compiled, srcfn, dstfn) ;
+
+ memcpy(srcfn + srcdirlen + len + 2, "instances", 10) ;
+ memcpy(dstfn + clen + 14 + len, "instances", 10) ;
+ dircopy(compiled, srcfn, dstfn) ;
+
memcpy(srcfn + srcdirlen + len + 2, "data", 5) ;
memcpy(dstfn + clen + 14 + len, "data", 5) ;
dircopy(compiled, srcfn, dstfn) ;