diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-06-25 20:45:54 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-06-25 20:45:54 +0000 |
| commit | 787c41b9bed5de99459916e0bd1ce7db8b3b8240 (patch) | |
| tree | ed8ad11c490706acf5630e027fd7a72a70a92f15 /src/init | |
| parent | 2fd8d6d946bfb28aeb3ae9badf0d6c8015d414c8 (diff) | |
| download | s6-linux-init-787c41b9bed5de99459916e0bd1ce7db8b3b8240.tar.xz | |
- bump skalibs dep to 2.1.6.0
- use s6-svc -X in finish script to make logger exit
- rc for 0.0.1.2
Diffstat (limited to 'src/init')
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 ; |