summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/s6-linux-init-maker.html2
-rwxr-xr-xskel/rc.init4
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>&nbsp;<em>initdefault</em>&nbsp;: 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"