summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--INSTALL2
-rw-r--r--doc/index.html4
-rw-r--r--doc/upgrade.html7
-rw-r--r--package/info2
-rw-r--r--src/shutdown/s6-linux-init-shutdownd.c6
6 files changed, 12 insertions, 10 deletions
diff --git a/AUTHORS b/AUTHORS
index ea6d280..c457cbc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,3 +7,4 @@ Thanks to:
Luis Ressel <aranea@aixah.de>
Samuel Holland <samuel@sholland.org>
Max Rees <maxcrees@me.com>
+ Guillermo <gdiazhartusch@gmail.com>
diff --git a/INSTALL b/INSTALL
index e00dc07..bceae26 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,7 @@ Build Instructions
- execline version 2.5.1.0 or later: https://skarnet.org/software/execline/
- s6 version 2.8.0.1 or later: https://skarnet.org/software/s6/
- Optional: nsss version 0.0.1.1 or later: https://skarnet.org/software/nsss/
- - Optional: utmps version 0.0.2.0 or later: https://skarnet.org/software/utmps/
+ - Optional: utmps version 0.0.2.2 or later: https://skarnet.org/software/utmps/
This software is Linux-specific. It will run on a Linux kernel,
version 2.6.32 or later. However, it should not be too hard to port to
diff --git a/doc/index.html b/doc/index.html
index 3dbc6b0..1323daf 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -90,7 +90,7 @@ want nsswitch-like functionality:
0.0.1.1 or later </li>
<li> If you want secure utmp functionality:
<a href="//skarnet.org/software/utmps/">utmps</a> version
-0.0.2.1 or later </li>
+0.0.2.2 or later </li>
</ul>
<p>
@@ -110,7 +110,7 @@ all the other packages against the <em>static</em> version of libskarnet.
<ul>
<li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.0.2.0.tar.gz">1.0.2.0</a>. </li>
+<a href="s6-linux-init-1.0.2.1.tar.gz">1.0.2.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 39f24eb..3ccf56f 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.0.2.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/utmps/">utmps</a>
+optional dependency bumped to 0.0.2.2. </li>
+</ul>
+
<h2> in 1.0.2.0 </h2>
<ul>
diff --git a/package/info b/package/info
index 75e1335..69dae7c 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-linux-init
-version=1.0.2.0
+version=1.0.2.1
category=admin
package_macro_name=S6_LINUX_INIT
diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c
index 7f86e66..f988955 100644
--- a/src/shutdown/s6-linux-init-shutdownd.c
+++ b/src/shutdown/s6-linux-init-shutdownd.c
@@ -88,12 +88,6 @@ static inline void run_stage3 (char const *basedir, char const *const *envp)
else if (WEXITSTATUS(wstat))
{
char fmt[UINT_FMT] ;
- fmt[uint_fmt(fmt, WTERMSIG(wstat))] = 0 ;
- strerr_warnw3x(stage3, " was killed by signal ", fmt) ;
- }
- else if (WEXITSTATUS(wstat))
- {
- char fmt[UINT_FMT] ;
fmt[uint_fmt(fmt, WEXITSTATUS(wstat))] = 0 ;
strerr_warnw3x(stage3, " exited ", fmt) ;
}