diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 8 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 4 |
5 files changed, 13 insertions, 7 deletions
@@ -10,7 +10,7 @@ Build Instructions - execline version 2.1.2.2 or later: http://skarnet.org/software/execline/ - s6-portable-utils version 2.0.5.0 or later: http://skarnet.org/software/s6-portable-utils/ - s6-linux-utils version 2.0.2.1 or later: http://skarnet.org/software/s6-linux-utils/ - - s6 version 2.1.5.0 or later: http://skarnet.org/software/s6/ + - s6 version 2.1.6.0 or later: http://skarnet.org/software/s6/ Note that all those are build-time dependencies, and they are *also* run-time dependencies when you use the init binary created diff --git a/doc/index.html b/doc/index.html index 98cad2f..eafcb0b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ a small FAQ. <li> <a href="http://skarnet.org/software/s6-linux-utils/">s6-linux-utils</a> version 2.0.2.1 or later </li> <li> <a href="http://skarnet.org/software/s6/">s6</a> version -2.1.5.0 or later </li> +2.1.6.0 or later </li> </ul> <p> @@ -86,7 +86,7 @@ against the shared version of the skalibs library, it also becomes a <ul> <li> The current released version of s6-linux-init is -<a href="s6-linux-init-0.0.1.1.tar.gz">0.0.1.1</a>. </li> +<a href="s6-linux-init-0.0.1.2.tar.gz">0.0.1.2</a>. </li> <li> Alternatively, you can checkout a copy of the s6-linux-init git repository: <pre> git clone git://git.skarnet.org/s6-linux-init </pre> </li> </ul> diff --git a/doc/upgrade.html b/doc/upgrade.html index c360ce9..b50899a 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,12 +18,18 @@ <h1> What has changed in s6-linux-init </h1> +<h2> in 0.0.1.2 </h2> + +<ul> + <li> <a href="http://skarnet.org/software/s6/">s6</a> dependency +bumped to 2.1.6.0. </li> +</ul> <h2> in 0.0.1.1 </h2> <ul> <li> <a href="http://skarnet.org/software/s6/">s6</a> dependency -bumped to 2.1.5.0 </li> +bumped to 2.1.5.0. </li> </ul> </body> diff --git a/package/info b/package/info index bb25040..64f6dd1 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-init -version=0.0.1.1 +version=0.0.1.2 category=admin package_macro_name=S6_LINUX_INIT diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index cc8ca57..fe10e3c 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -102,11 +102,11 @@ static int finish_script (buffer *b) if (buffer_puts(b, "#!") < 0 || buffer_puts(b, bindir) < 0 || buffer_puts(b, "/execlineb -S0\n\n" - "cd /\nredirfd -w 2 /dev/console\nfdmove -c 1 2\nif { s6-svc -xh -- ") < 0 + "cd /\nredirfd -w 2 /dev/console\nfdmove -c 1 2\nif { s6-svc -X -- ") < 0 || !string_quote(&satmp, slashrun, str_len(slashrun))) return 0 ; if (buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0) goto err ; satmp.len = sabase ; - if (buffer_puts(b, "/service/s6-svscan-log }\nwait { }\n") < 0 + if (buffer_puts(b, "/service/s6-svscan-log }\nwait -r -- { }\n") < 0 || !string_quote(&satmp, shutdown_script, str_len(shutdown_script))) return 0 ; if (buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0) goto err ; satmp.len = sabase ; |