diff options
| -rw-r--r-- | doc/s6-linux-init-maker.html | 5 | ||||
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html index 33bb550..802d8f9 100644 --- a/doc/s6-linux-init-maker.html +++ b/doc/s6-linux-init-maker.html @@ -334,7 +334,10 @@ means open fds limit. Note that unlike s6-softlimit, which only sets <em>soft limits</em>, i.e. process hierarchy-wide limits, the values given here declare <em>hard limits</em> that will be enforced for the whole system to be booted: it will be impossible to raise soft limits -above these values. </li> <br /> +above these values. <strong>Warning:</strong> misuse of this option is +likely to make your system unbootable; make sure you don't prevent +process 1 and the whole process hierarchy from allocating enough +resources. </li> <br /> <li> <tt>-C</tt> : create a set of scripts that is suitable for running <em>in a container</em>. This modifies some behaviours: diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index 1a8827b..98b9b46 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -242,7 +242,7 @@ static inline int stage1_script (buffer *b, char const *data) if (!put_shebang_options(b, "-S0")) return 0 ; if (ressa.len) { - if (buffer_puts(b, S6_EXTBINPREFIX "s6-softlimit -h ") < 0 + if (buffer_puts(b, S6_EXTBINPREFIX "s6-softlimit -H ") < 0 || buffer_put(b, ressa.s, ressa.len) < 0) goto err ; } if (buffer_puts(b, S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init -c ") < 0 |