diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/index.html | 6 | ||||
| -rw-r--r-- | doc/overview.html | 1 | ||||
| -rw-r--r-- | doc/s6-linux-init-maker.html | 17 | ||||
| -rw-r--r-- | doc/upgrade.html | 9 |
4 files changed, 30 insertions, 3 deletions
diff --git a/doc/index.html b/doc/index.html index 14230a8..e5e0408 100644 --- a/doc/index.html +++ b/doc/index.html @@ -80,9 +80,9 @@ programs used when you boot a system created with <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>) if you link against the shared version of the skalibs library. </li> <li> <a href="//skarnet.org/software/execline/">execline</a> version -2.9.2.0 or later. It is a build-time and boot-time requirement. </li> +2.9.2.1 or later. It is a build-time and boot-time requirement. </li> <li> <a href="//skarnet.org/software/s6/">s6</a> version -2.11.3.0 or later. It is a build-time and boot-time requirement. </li> +2.11.3.1 or later. It is a build-time and boot-time requirement. </li> </ul> <p> @@ -110,7 +110,7 @@ want nsswitch-like functionality: <ul> <li> The current released version of s6-linux-init is -<a href="s6-linux-init-1.1.0.0.tar.gz">1.1.0.0</a>. </li> +<a href="s6-linux-init-1.1.1.0.tar.gz">1.1.1.0</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/overview.html b/doc/overview.html index ef01e1e..9768bf2 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -98,6 +98,7 @@ invariants are met: </p> <ul> + <li> Global resource limits, if any, are set on the system. </li> <li> A tmpfs is mounted on <tt>/run</tt> - that location can be changed at build-time via the <tt>--tmpfsdir</tt> option to configure. The rest of this document assumes it is <tt>/run</tt>. </li> diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html index 1390781..33bb550 100644 --- a/doc/s6-linux-init-maker.html +++ b/doc/s6-linux-init-maker.html @@ -61,6 +61,7 @@ machine</em>. If it is not the case, the system will fail to boot. [ -D <em>initdefault</em> ] \ [ -n | -N ] \ [ -f <em>skeldir</em> ] \ + [ -R <em>resource_limit_list</em> ] \ [ -C ] \ [ -B ] \ [ -S ] \ @@ -319,6 +320,22 @@ build time. This option is typically useful when distributions run <tt>s6-linux-init-maker</tt> in packaging scripts, when preparing files in a staging directory. </li> <br /> + <li> <tt>-R</tt> <em>resource_limit_list</em> : declare +global resource limits (a.k.a. "hard limits") for the system to be +booted. <em>resource_limit_list</em> is a comma-separated list of +instructions such as <tt>o2000</tt>, <tt>d=</tt> or <tt>c0</tt>: +a letter followed by either the character <tt>=</tt>, which means +unlimited, or a number, which is the value of the resource limit. +The letter specifies the resource being addressed, as defined by +the option letters used by +<a href="//skarnet.org/software/s6/s6-softlimit.html">s6-softlimit</a>: +for instance, <tt>c</tt> means core file size limit, and <tt>o</tt> +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 /> + <li> <tt>-C</tt> : create a set of scripts that is suitable for running <em>in a container</em>. This modifies some behaviours: <ul> diff --git a/doc/upgrade.html b/doc/upgrade.html index e1799f1..18066c7 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,15 @@ <h1> What has changed in s6-linux-init </h1> +<h2> in 1.1.1.0 </h2> + +<ul> + <li> <a href="//skarnet.org/software/execline/">execline</a> +dependency bumped to 2.9.2.1. </li> + <li> <a href="//skarnet.org/software/s6/">s6</a> +dependency bumped to 2.11.3.1. </li> +</ul> + <h2> in 1.1.0.0 </h2> <ul> |