Prepare for 1.1.1.1; fix ctty passing when we have a logger

Signed-off-by: Laurent Bercot <ska@appnovation.com>

6 files changed, 21 insertions, 8 deletions

diff --git a/INSTALL b/INSTALL
index b8536d9..df09122 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.13.1.1 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.13.2.0 or later: https://skarnet.org/software/skalibs/
   - Optional: nsss version 0.2.0.3 or later: https://skarnet.org/software/nsss/
   - Optional: utmps version 0.1.2.1 or later: https://skarnet.org/software/utmps/
   - execline version 2.9.3.0 or later: https://skarnet.org/software/execline/
diff --git a/NEWS b/NEWS
index f33518c..04d0428 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-init.
 
+In 1.1.1.1
+----------
+
+ - Bugfixes.
+
+
 In 1.1.1.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 6aade8d..53a58dd 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -73,7 +73,7 @@ kernel command line </li>
  <li> A Linux-based system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.13.1.1 or later. It's a build-time requirement. It's also a run-time
+2.13.2.0 or later. It's a build-time requirement. It's also a run-time
 requirement (for <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>)
 as well as a boot-time requirement (i.e. a run-time requirement for the
 programs used when you boot a system created with
@@ -110,7 +110,7 @@ want nsswitch-like functionality:
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.1.1.0.tar.gz">1.1.1.0</a>. </li>
+<a href="s6-linux-init-1.1.1.1.tar.gz">1.1.1.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-init/">s6-linux-init
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 230d1e6..6bdb29b 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.1.1.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.2.0. </li>
+</ul>
+
 <h2> in 1.1.1.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 9ce90b5..4d78ea1 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=1.1.1.0
+version=1.1.1.1
 category=admin
 package_macro_name=S6_LINUX_INIT
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index 699b89f..103c233 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -204,10 +204,10 @@ int main (int argc, char const **argv, char const *const *envp)
       if (r) strerr_warnw1x("parent wrote to fd 3!") ;
       close(3) ;
     }
-    if (!slashdev && hasconsole && isatty(1))
+    if (!slashdev && hasconsole && isatty(2 - nologger))
     {
-      tty = ttyname(1) ;
-      if (!tty) strerr_warnwu1sys("ttyname stdout") ;
+      tty = ttyname(2 - nologger) ;
+      if (!tty) strerr_warnwu2sys("ttyname std", nologger ? "err" : "out") ;
     }
   }
   else if (hasconsole) allwrite(1, BANNER, sizeof(BANNER) - 1) ;
@@ -300,7 +300,7 @@ int main (int argc, char const **argv, char const *const *envp)
       newenvp[0] = pathvar ;
     }
     if (nologger && pipe(notifpipe) < 0) strerr_diefu1sys(111, "pipe") ;
-    if (tty && !slashdev && ioctl(1, TIOCNOTTY) == -1) strerr_warnwu1sys("relinquish control terminal") ;
+    if (tty && !slashdev && ioctl(2 - nologger, TIOCNOTTY) == -1) strerr_warnwu1sys("relinquish control terminal") ;
 
     pid = fork() ;
     if (pid == -1) strerr_diefu1sys(111, "fork") ;