summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-06-14 19:01:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-06-14 19:01:07 +0000
commitca023c54f5be4093734a5ef99009d9932a6b3453 (patch)
tree1cf5108adaba0b0d8adcc9453aa01ebfb9be419c
parent505f396c0bd57182e8a02ed62ecf075438ed2c78 (diff)
downloads6-linux-utils-ca023c54f5be4093734a5ef99009d9932a6b3453.tar.xz
- Fix for s6-uevent-spawner event delay
- rc for 2.0.2.1
-rw-r--r--INSTALL2
-rw-r--r--doc/index.html4
-rw-r--r--doc/upgrade.html8
-rw-r--r--package/info2
-rw-r--r--src/minutils/s6-uevent-spawner.c2
5 files changed, 12 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 99ee0a1..78d753e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
- A Linux-based system with a standard C development environment
- GNU make version 4.0 or later
- - skalibs version 2.3.1.2 or later: http://skarnet.org/software/skalibs/
+ - skalibs version 2.3.5.1 or later: http://skarnet.org/software/skalibs/
This software is Linux-specific. It will run on a Linux kernel,
version 2.6.32 or later.
diff --git a/doc/index.html b/doc/index.html
index 976acf9..1d2c885 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -33,7 +33,7 @@
<li> A Linux-based system with a standard C development environment </li>
<li> GNU make, version 4.0 or later </li>
<li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.1.2 or later. It's a build-time requirement. It's also a run-time
+2.3.5.1 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>
</ul>
@@ -48,7 +48,7 @@ library. </li>
<h3> Download </h3>
<ul>
- <li> The current released version of s6-linux-utils is <a href="s6-linux-utils-2.0.2.0.tar.gz">2.0.2.0</a>. </li>
+ <li> The current released version of s6-linux-utils is <a href="s6-linux-utils-2.0.2.1.tar.gz">2.0.2.1</a>. </li>
<li> Alternatively, you can checkout a copy of the s6-linux-utils git repository:
<pre> git clone git://git.skarnet.org/s6-linux-utils </pre> </li>
</ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 83597e4..a99d029 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,7 +18,13 @@
<h1> What has changed in s6-linux-utils </h1>
-<h2> in 2.0.2.0 </h2>
+<h2> in 2.0.2.1 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.3.5.1 </li>
+</ul>
+
+<h2> in 2.0.2.0 </h2>
<ul>
<li> skalibs dependency bumped to 2.3.1.2 </li>
diff --git a/package/info b/package/info
index 79f07d5..52fab87 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-linux-utils
-version=2.0.2.0
+version=2.0.2.1
category=admin
package_macro_name=S6_LINUX_UTILS
diff --git a/src/minutils/s6-uevent-spawner.c b/src/minutils/s6-uevent-spawner.c
index 40f088e..f9dc481 100644
--- a/src/minutils/s6-uevent-spawner.c
+++ b/src/minutils/s6-uevent-spawner.c
@@ -228,7 +228,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
strerr_diefu1x(111, "iopause: trouble with selfpipe") ;
if (x[0].revents & IOPAUSE_READ)
handle_signals() ;
- else if (!pid && cont && (x[1].revents & IOPAUSE_READ))
+ if (cont && x[1].revents & IOPAUSE_READ || buffer_len(buffer_0))
handle_stdin(&sa, linevar, argv, envp) ;
}
}