From feb8dfb10a78d17c66cc1b89382265503c165799 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 19 Jun 2026 21:09:11 +0000
Subject:  Fix s6-instance-maker invocation of s6-svscan

---
 NEWS                             | 1 +
 doc/upgrade.html                 | 3 +++
 src/instance/s6-instance-maker.c | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ad24466..022d688 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ In 2.15.0.0
 
  - Bugfixes.
  - Adaptation to skalibs-2.15.0.0.
+ - s6-svscan's -c option has disappeared.
  - s6-svscan's scandir argument is now mandatory.
  - s6-setsid now autodetects its controlling terminal by default.
  - Complete ftrigr refactor. This doesn't impact CLI programs,
diff --git a/doc/upgrade.html b/doc/upgrade.html
index cd2d648..fc31668 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -42,6 +42,9 @@ dependency bumped to 2.15.0.0 </li>
 optional dependency bumped to 0.2.1.2. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a>
 recommended dependency bumped to 2.9.9.0. </li>
+ <li> The interface for <a href="s6-svscan.html">s6-svscan</a> has
+changed. The <em>scandir</em> argument is now mandatory, and the <tt>-c</tt>
+option is not supported anymore. </li>
  <li> Large changes around the <a href="libs6/ftrigr.html">ftrigr library</a>:
   <ul>
    <li> <a href="s6-ftrigrd.html">s6-ftrigrd</a> is now an
diff --git a/src/instance/s6-instance-maker.c b/src/instance/s6-instance-maker.c
index d0875e0..b986727 100644
--- a/src/instance/s6-instance-maker.c
+++ b/src/instance/s6-instance-maker.c
@@ -47,7 +47,7 @@ static int write_run (buffer *b, void *data)
      || buffer_put(b, "\n", 1) < 0) goto err ;
     sa.len = 0 ;
   }
-  if (buffer_puts(b, S6_EXTBINPREFIX "s6-svscan -d3 -c") < 0
+  if (buffer_puts(b, S6_EXTBINPREFIX "s6-svscan -d3 -C") < 0
    || buffer_put(b, fmt, l) < 0
    || buffer_putsflush(b, " -- instance\n") < 0) return 0 ;
   return 1 ;
@@ -124,6 +124,7 @@ int main (int argc, char const *const *argv)
     strerr_dief1x(100, "invalid user") ;
   if (maxinstances < 1) maxinstances = 1 ;
   if (maxinstances > 90000) maxinstances = 90000 ;
+  if (logdir && !rcinfo[0]) maxinstances <<= 1 ;
   if (rcinfo[0])
   {
     if (strchr(rcinfo[0], '\n'))
@@ -137,7 +138,7 @@ int main (int argc, char const *const *argv)
       if (!rcinfo[1][0]) strerr_dief1x(100, "argument to -r must be: service or service/logger or service/logger/pipeline") ;
       if (rcinfo[1][0] == '/')
         strerr_dief2x(100, "logger", " name cannot be empty") ;
-      if (!logdir) strerr_dief1x(100, "logger specifiec (-r) but logdir not specified (-L)") ;
+      if (!logdir) strerr_dief1x(100, "logger specified (-r) but logdir not specified (-L)") ;
       rcinfo[2] = strchr(rcinfo[1], '/') ;
       if (rcinfo[2])
       {
-- 
cgit v1.3.1