diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/s6-linux-init-maker.html | 16 | ||||
| -rw-r--r-- | doc/s6-linux-init-telinit.html | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html index 218af02..f91a4e5 100644 --- a/doc/s6-linux-init-maker.html +++ b/doc/s6-linux-init-maker.html @@ -157,7 +157,8 @@ must be absolute. Default is <strong><tt>/etc/s6-linux-init/current</tt></strong>. </li> <p /> <li> <tt>-u</tt> <em>log_user</em> : the catch-all -logger will run as the <em>log_user</em> user. Default is <tt>root</tt>. </li> <p /> +logger will run as the <em>log_user</em> user. Default is +<strong><tt>root</tt></strong>. </li> <p /> <li> <tt>-G</tt> <em>early_getty</em> : if this option is set, <tt>s6-linux-init-maker</tt> will define an additional s6 service @@ -261,10 +262,10 @@ Default is <strong>3000</strong>, meaning a grace period of 3 seconds. </li> <p a runlevel set to <em>initdefault</em>, which can be an arbitrary string, but is usually <tt>2</tt>, <tt>3</tt>, <tt>5</tt> (traditional sysvinit behaviour) or <tt>default</tt> (OpenRC behaviour). Default is -<tt>default</tt>. Note that if a <tt>2</tt>, <tt>3</tt>, <tt>4</tt>, -<tt>5</tt>, or <tt>default</tt> argument is encountered in the kernel -command line, it will be interpreted as the runlevel to boot the system -on, and will override the default given here. </li> <p /> +<strong><tt>default</tt></strong>. Note that if a <tt>2</tt>, <tt>3</tt>, +<tt>4</tt>, <tt>5</tt>, or <tt>default</tt> argument is encountered in +the kernel command line, it will be interpreted as the runlevel to boot +the system on, and will override the default given here. </li> <p /> <li> <tt>-n</tt> : at boot time, assume that a tmpfs is already present on <tt>/run</tt> (or the argument that was given to the @@ -298,7 +299,8 @@ incompatible with the <tt>-n</tt> option. </li> <p /> <li> <tt>-f</tt> <em>skeldir</em> : copy the skeleton scripts from directory <em>skeldir</em>. By default, <em>skeldir</em> -is <tt>/etc/s6-linux-init/skel</tt>, or the directory that has been +is <strong><tt>/etc/s6-linux-init/skel</tt></strong>, or the directory +that has been given as an argument to the <tt>--skeldir</tt> configure option at build time. This option is typically useful when distributions run <tt>s6-linux-init-maker</tt> in packaging scripts, when preparing @@ -309,7 +311,7 @@ available when the s6-linux-init package has been built with the <tt>--enable-utmps</tt> configure option, that enables support for the <a href="//skarnet.org/software/utmps/">utmps</a> package. The option defines the user that the <tt>utmpd</tt> and <tt>wtmpd</tt> services -will run as. Default is <tt>utmp</tt>. </li> <p /> +will run as. Default is <strong><tt>utmp</tt></strong>. </li> <p /> </ul> <h2> Organization of the created directory </h2> diff --git a/doc/s6-linux-init-telinit.html b/doc/s6-linux-init-telinit.html index 2bea4e5..49862d7 100644 --- a/doc/s6-linux-init-telinit.html +++ b/doc/s6-linux-init-telinit.html @@ -27,7 +27,7 @@ just <tt>init</tt> with an argument. <h2> Interface </h2> <pre> - s6-linux-init-telinit <tt>rl</tt> + s6-linux-init-telinit <em>rl</em> </pre> <ul> |