diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-05-13 20:31:30 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-05-13 20:31:30 +0000 |
| commit | d1559c5f9c657543d9b2b4cc9ab6d5ea9d87fb52 (patch) | |
| tree | a98461e415ce0a25dec8e4ddee9065681c8895b0 | |
| parent | 8fb864c8cd0e8e3f714c47e4f3a985f47ebb7608 (diff) | |
| download | s6-linux-init-d1559c5f9c657543d9b2b4cc9ab6d5ea9d87fb52.tar.xz | |
Doc fixes and clarifications
| -rw-r--r-- | doc/s6-linux-init-maker.html | 2 | ||||
| -rwxr-xr-x | skel/rc.init | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html index 02fd15d..34fa829 100644 --- a/doc/s6-linux-init-maker.html +++ b/doc/s6-linux-init-maker.html @@ -254,7 +254,7 @@ them to exit gracefully; then, after <em>finalsleeptime</em> milliseconds, they will receive a SIGKILL and the shutdown sequence will go on. This option configures the amount of time that will elapse between the SIGTERM/SIGHUP and the SIGKILL. -Default is <strong>2000</strong>, meaning a grace period of 2 seconds. </li> <p /> +Default is <strong>3000</strong>, meaning a grace period of 3 seconds. </li> <p /> <li> <tt>-D</tt> <em>initdefault</em> : boot the system with a runlevel set to <em>initdefault</em>, which can be an arbitrary diff --git a/skel/rc.init b/skel/rc.init index 37c3ea9..47824d7 100755 --- a/skel/rc.init +++ b/skel/rc.init @@ -30,5 +30,9 @@ shift ### 2. Starting the wanted set of services ### This is also called every time you change runlevels with telinit. ### (edit the location to suit your installation) +### By default, $rl is the string "default", unless you changed it +### via the -D option to s6-linux-init-maker. +### Numeric arguments from 1 to 5 on the kernel command line will +### override the default. # exec /etc/s6-linux-init/current/scripts/runlevel "$rl" |