Merge tag 'upstream-2.1.2' into debian-sid

tag upstream-2.1.2

270 files changed, 173 insertions, 106 deletions

diff --git a/runit-2.1.1/doc/benefits.html b/runit-2.1.2/doc/benefits.html
index b1687d9..b1687d9 100644
--- a/runit-2.1.1/doc/benefits.html
+++ b/runit-2.1.2/doc/benefits.html
diff --git a/runit-2.1.1/doc/chpst.8.html b/runit-2.1.2/doc/chpst.8.html
index 97d90f2..97d90f2 100644
--- a/runit-2.1.1/doc/chpst.8.html
+++ b/runit-2.1.2/doc/chpst.8.html
diff --git a/runit-2.1.1/doc/debian b/runit-2.1.2/doc/debian
index 8784129..8784129 120000
--- a/runit-2.1.1/doc/debian
+++ b/runit-2.1.2/doc/debian
diff --git a/runit-2.1.1/doc/dependencies.html b/runit-2.1.2/doc/dependencies.html
index 452b56c..452b56c 100644
--- a/runit-2.1.1/doc/dependencies.html
+++ b/runit-2.1.2/doc/dependencies.html
diff --git a/runit-2.1.1/doc/faq.html b/runit-2.1.2/doc/faq.html
index a2eae27..a2eae27 100644
--- a/runit-2.1.1/doc/faq.html
+++ b/runit-2.1.2/doc/faq.html
diff --git a/runit-2.1.1/doc/index.html b/runit-2.1.2/doc/index.html
index 2982fff..85bb01b 100644
--- a/runit-2.1.1/doc/index.html
+++ b/runit-2.1.2/doc/index.html
@@ -135,22 +135,32 @@ FreeBSD</a>
 OpenBSD</a>
 <li><a href="http://pkgsrc.se/wip/runit/">
 NetBSD</a>
-<li><a href="http://annvix.org/">
-Annvix</a> (as default init scheme)
 <li><a href="http://packages.ubuntu.com/runit">
 Ubuntu</a> (as alternative init scheme)
-<li><a href="http://packages.gentoo.org/search/?sstring=runit">
+<li><a href="http://packages.gentoo.org/package/sys-process/runit">
 Gentoo</a>
+<li><a href="https://code.google.com/p/runit-for-lfs/">
+Linux from Scratch</a>
+<li><a href="http://www.finnix.org/">
+Finnix</a>
 <li><a href="http://www.smeserver.org/">
 SME server</a>
-<li><a href="http://www.opensde.org/">
-OpenSDE</a>
+<li><a href="http://linux-vserver.org/Running_runit-supervised_services_inside_a_vserver">
+Linux-VServer</a>
 <li><a href="http://www.t2-project.org/">
 T2</a>
-<li><a href="http://zinux.cynicbytrade.com/">
-Zinux Linux</a> (as default init scheme)
 <li><a href="http://www.gobolinux.org/">
 GoboLinux</a>
+<li><a href="http://www.dragora.org/">
+Dragora GNU/Linux</a> (as default init scheme)
+<li><a href="https://wiki.archlinux.org/index.php/Runit">
+ArchLinux</a>
+<li><a href="http://www.opensde.org/">
+OpenSDE</a>
+<li><a href="http://zinux.cynicbytrade.com/">
+Zinux Linux</a> (as default init scheme)
+<li><a href="http://deepofix.org/">
+deepOfix Mail Server</a> (as default init scheme)
 </ul>
 If you know of more distributions, please
 <a href="mailto:supervision@list.skarnet.org">let me know</a>.
diff --git a/runit-2.1.1/doc/install.html b/runit-2.1.2/doc/install.html
index ad6bc71..fb3b2c4 100644
--- a/runit-2.1.1/doc/install.html
+++ b/runit-2.1.2/doc/install.html
@@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now:
  # chmod 1755 /package
 </pre>
 Download
-<a href="runit-2.1.1.tar.gz">runit-2.1.1.tar.gz</a> into <tt>/package</tt>
+<a href="runit-2.1.2.tar.gz">runit-2.1.2.tar.gz</a> into <tt>/package</tt>
 and unpack the archive
 <pre>
  # cd /package
- # gunzip runit-2.1.1.tar
- # tar -xpf runit-2.1.1.tar
- # rm runit-2.1.1.tar
- # cd admin/runit-2.1.1
+ # gunzip runit-2.1.2.tar
+ # tar -xpf runit-2.1.2.tar
+ # rm runit-2.1.2.tar
+ # cd admin/runit-2.1.2
 </pre>
 On MacOSX, do
 <pre>
@@ -43,7 +43,7 @@ hierarchy, do:
 </pre>
 To report success:
 <pre>
- # mail pape-runit-2.1.1@smarden.org &lt;compile/sysdeps
+ # mail pape-runit-2.1.2@smarden.org &lt;compile/sysdeps
 </pre>
 If you use <i>runit</i> regularly, please
 <a href="http://smarden.org/pape/#contribution">contribute</a> to the project.
diff --git a/runit-2.1.1/doc/replaceinit.html b/runit-2.1.2/doc/replaceinit.html
index e8d5ece..70f6f7d 100644
--- a/runit-2.1.1/doc/replaceinit.html
+++ b/runit-2.1.2/doc/replaceinit.html
@@ -122,7 +122,7 @@ default Unix process no 1 <i>runit</i>.
 </pre>
 To report success:
 <pre>
- # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-2.1.1@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-2.1.2@smarden.org
 </pre>
 <hr>
 
@@ -211,7 +211,7 @@ This will cause <i>runit</i> to enter stage 3 which runs
 <p>
 To report success:
 <pre>
- # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-2.1.1@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-2.1.2@smarden.org
 </pre>
 <h3>Step 5: Service migration</h3>
 The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the
diff --git a/runit-2.1.1/doc/runit-init.8.html b/runit-2.1.2/doc/runit-init.8.html
index 014d2f1..014d2f1 100644
--- a/runit-2.1.1/doc/runit-init.8.html
+++ b/runit-2.1.2/doc/runit-init.8.html
diff --git a/runit-2.1.1/doc/runit.8.html b/runit-2.1.2/doc/runit.8.html
index 6c46b39..6c46b39 100644
--- a/runit-2.1.1/doc/runit.8.html
+++ b/runit-2.1.2/doc/runit.8.html
diff --git a/runit-2.1.1/doc/runlevels.html b/runit-2.1.2/doc/runlevels.html
index c0e49c3..c0e49c3 100644
--- a/runit-2.1.1/doc/runlevels.html
+++ b/runit-2.1.2/doc/runlevels.html
diff --git a/runit-2.1.1/doc/runscripts.html b/runit-2.1.2/doc/runscripts.html
index f832b63..f832b63 100644
--- a/runit-2.1.1/doc/runscripts.html
+++ b/runit-2.1.2/doc/runscripts.html
diff --git a/runit-2.1.1/doc/runsv.8.html b/runit-2.1.2/doc/runsv.8.html
index d27deeb..d27deeb 100644
--- a/runit-2.1.1/doc/runsv.8.html
+++ b/runit-2.1.2/doc/runsv.8.html
diff --git a/runit-2.1.1/doc/runsvchdir.8.html b/runit-2.1.2/doc/runsvchdir.8.html
index 54e66a5..54e66a5 100644
--- a/runit-2.1.1/doc/runsvchdir.8.html
+++ b/runit-2.1.2/doc/runsvchdir.8.html
diff --git a/runit-2.1.1/doc/runsvdir.8.html b/runit-2.1.2/doc/runsvdir.8.html
index f4053db..f4053db 100644
--- a/runit-2.1.1/doc/runsvdir.8.html
+++ b/runit-2.1.2/doc/runsvdir.8.html
diff --git a/runit-2.1.1/doc/sv.8.html b/runit-2.1.2/doc/sv.8.html
index 6552f58..504b30b 100644
--- a/runit-2.1.1/doc/sv.8.html
+++ b/runit-2.1.2/doc/sv.8.html
@@ -61,48 +61,52 @@ signal respectively. </dd>
 <dd>If the service is running, send it the TERM signal,
 and the CONT signal. Do not restart the service. If the service is down,
 and no log service exists, <i><b>runsv</b>(8)</i> exits. If the service is down and a
-log service exists, send the TERM signal to the log service. If the log
-service is down, <i><b>runsv</b>(8)</i> exits. This command is ignored if it is given
-to an appendant log service. </dd>
+log service exists, <i><b>runsv</b>(8)</i> closes the standard input of the log service
+and waits for it to terminate. If the log service is down, <i><b>runsv</b>(8)</i> exits.
+This command is ignored if it is given to an appendant log service. </dd>
 </dl>
 <p>
-<b>sv</b> actually looks only at the first character
-of these <i>command</i>s. 
-<h3><a name='sect4'>Commands compatible to LSB init script actions</a></h3>
+<b>sv</b> actually
+looks only at the first character of these <i>command</i>s. 
+<h3><a name='sect4'>Commands compatible
+to LSB init script actions</a></h3>
 
 <dl>
 
-<dt><b>status</b>
-</dt>
+<dt><b>status</b> </dt>
 <dd>Same as <i>status</i>. </dd>
 
 <dt><b>start</b> </dt>
-<dd>Same as <i>up</i>, but wait up to 7 seconds for the command
-to take effect. Then report the status or timeout. If the script <i>./check</i> exists
-in the service directory, <b>sv</b> runs this script to check whether the service
-is up and available; it&rsquo;s considered to be available if <i>./check</i> exits with
-0. </dd>
+<dd>Same as <i>up</i>, but wait
+up to 7 seconds for the command to take effect. Then report the status or
+timeout. If the script <i>./check</i> exists in the service directory, <b>sv</b> runs this
+script to check whether the service is up and available; it&rsquo;s considered
+to be available if <i>./check</i> exits with 0. </dd>
 
 <dt><b>stop</b> </dt>
-<dd>Same as <i>down</i>, but wait up to 7 seconds for the service to become
-down. Then report the status or timeout. </dd>
+<dd>Same as <i>down</i>, but wait up to
+7 seconds for the service to become down. Then report the status or timeout.
+</dd>
+
+<dt><b>reload</b> </dt>
+<dd>Same as <i>hup</i>, and additionally report the status afterwards. </dd>
 
-<dt><b>restart</b> </dt>
-<dd>Send the commands <i>term</i>,
-<i>cont</i>, and <i>up</i> to the service, and wait up to 7 seconds for the service to
-restart. Then report the status or timeout. If the script <i>./check</i> exists in
-the service directory, <b>sv</b> runs this script to check whether the service
-is up and available again; it&rsquo;s considered to be available if <i>./check</i> exits
-with 0. </dd>
+<dt><b>restart</b>
+</dt>
+<dd>Send the commands <i>term</i>, <i>cont</i>, and <i>up</i> to the service, and wait up to 7 seconds
+for the service to restart. Then report the status or timeout. If the script
+<i>./check</i> exists in the service directory, <b>sv</b> runs this script to check whether
+the service is up and available again; it&rsquo;s considered to be available if
+<i>./check</i> exits with 0. </dd>
 
 <dt><b>shutdown</b> </dt>
-<dd>Same as <i>exit</i>, but wait up to 7 seconds for the <i><b>runsv</b>(8)</i>
-process to terminate. Then report the status or timeout. </dd>
+<dd>Same as <i>exit</i>, but wait up to 7 seconds for
+the <i><b>runsv</b>(8)</i> process to terminate. Then report the status or timeout. </dd>
 
-<dt><b>force-stop</b> </dt>
-<dd>Same as
-<i>down</i>, but wait up to 7 seconds for the service to become down. Then report
-the status, and on timeout send the service the <i>kill</i> command. </dd>
+<dt><b>force-stop</b>
+</dt>
+<dd>Same as <i>down</i>, but wait up to 7 seconds for the service to become down. Then
+report the status, and on timeout send the service the <i>kill</i> command. </dd>
 
 <dt><b>force-reload</b>
 </dt>
@@ -122,34 +126,40 @@ the service is up and available again; it&rsquo;s considered to be available if
 <dd>Same as <i>exit</i>, but wait up to 7 seconds
 for the <i><b>runsv</b>(8)</i> process to terminate. Then report the status, and on timeout
 send the service the <i>kill</i> command. </dd>
+
+<dt><b>try-restart</b> </dt>
+<dd>if the service is running,
+send it the <i>term</i> and <i>cont</i> commands, and wait up to 7 seconds for the service
+to restart. Then report the status or timeout. 
+<p> </dd>
 </dl>
 
 <h3><a name='sect5'>Additional Commands</a></h3>
 
 <dl>
 
-<dt><b>check</b> </dt>
-<dd>Check for the
-service to be in the state that&rsquo;s been requested. Wait up to 7 seconds for
-the service to reach the requested state, then report the status or timeout.
-If the requested state of the service is <i>up</i>, and the script <i>./check</i> exists
-in the service directory, <b>sv</b> runs this script to check whether the service
-is up and running; it&rsquo;s considered to be up if <i>./check</i> exits with 0. </dd>
+<dt><b>check</b>
+</dt>
+<dd>Check for the service to be in the state that&rsquo;s been requested. Wait up to
+7 seconds for the service to reach the requested state, then report the
+status or timeout. If the requested state of the service is <i>up</i>, and the
+script <i>./check</i> exists in the service directory, <b>sv</b> runs this script to check
+whether the service is up and running; it&rsquo;s considered to be up if <i>./check</i>
+exits with 0. </dd>
 </dl>
 
 <h2><a name='sect6'>Options</a></h2>
 
 <dl>
 
-<dt><b>-v</b>
-</dt>
-<dd>If the <i>command</i> is up, down, term, once, cont, or exit, then wait up to
-7 seconds for the command to take effect. Then report the status or timeout.
-</dd>
+<dt><b>-v</b> </dt>
+<dd>If the <i>command</i> is up, down, term, once, cont, or
+exit, then wait up to 7 seconds for the command to take effect. Then report
+the status or timeout. </dd>
 
 <dt><b>-w <i>sec</b> </i></dt>
-<dd>Override the default timeout of 7 seconds with <i>sec</i> seconds. This option
-implies <i>-v</i>. </dd>
+<dd>Override the default timeout of 7 seconds with
+<i>sec</i> seconds. This option implies <i>-v</i>. </dd>
 </dl>
 
 <h2><a name='sect7'>Environment</a></h2>
@@ -157,34 +167,35 @@ implies <i>-v</i>. </dd>
 <dl>
 
 <dt><b>SVDIR</b> </dt>
-<dd>The environment variable $SVDIR overrides the
-default services directory <i>/service/</i>. </dd>
+<dd>The environment variable
+$SVDIR overrides the default services directory <i>/service/</i>. </dd>
 
 <dt><b>SVWAIT</b> </dt>
-<dd>The environment variable $SVWAIT
-overrides the default 7 seconds to wait for a command to take effect. It
-is overridden by the -w option. </dd>
+<dd>The environment
+variable $SVWAIT overrides the default 7 seconds to wait for a command
+to take effect. It is overridden by the -w option. </dd>
 </dl>
 
 <h2><a name='sect8'>Exit Codes</a></h2>
-<b>sv</b> exits 0, if the <i>command</i> was
-successfully sent to all <i>services</i>, and, if it was told to wait, the <i>command</i>
-has taken effect to all services. <p>
-For each <i>service</i> that caused an error
-(e.g. the directory is not controlled by a <i><b>runsv</b>(8)</i> process, or <b>sv</b> timed
-out while waiting), <b>sv</b> increases the exit code by one and exits non zero.
-The maximum is 99. <b>sv</b> exits 100 on error. <p>
-If <b>sv</b> is called with a base name
-other than <b>sv</b>: it exits 1 on timeout or trouble sending the command; if
-the <i>command</i> is <b>status</b>, it exits 3 if the service is down, and 4 if the
-status is unknown; it exits 2 on wrong usage, and 151 on error. 
+<b>sv</b> exits 0, if
+the <i>command</i> was successfully sent to all <i>services</i>, and, if it was told
+to wait, the <i>command</i> has taken effect to all services. <p>
+For each <i>service</i>
+that caused an error (e.g. the directory is not controlled by a <i><b>runsv</b>(8)</i>
+process, or <b>sv</b> timed out while waiting), <b>sv</b> increases the exit code by
+one and exits non zero. The maximum is 99. <b>sv</b> exits 100 on error. <p>
+If <b>sv</b> is
+called with a base name other than <b>sv</b>: it exits 1 on timeout or trouble
+sending the command; if the <i>command</i> is <b>status</b>, it exits 3 if the service
+is down, and 4 if the status is unknown; it exits 2 on wrong usage, and
+151 on error. 
 <h2><a name='sect9'>See Also</a></h2>
-<i>runsv(8)</i>,
-<i>chpst(8)</i>, <i>svlogd(8)</i>, <i>runsvdir(8)</i>, <i>runsvchdir(8)</i>, <i>runit(8)</i>, <i>runit-init(8)</i>
-<p>
+<i>runsv(8)</i>, <i>chpst(8)</i>, <i>svlogd(8)</i>, <i>runsvdir(8)</i>, <i>runsvchdir(8)</i>,
+<i>runit(8)</i>, <i>runit-init(8)</i> <p>
 <i>http://smarden.org/runit/</i> 
 <h2><a name='sect10'>Author</a></h2>
-Gerrit Pape &lt;pape@smarden.org&gt; <p>
+Gerrit Pape &lt;pape@smarden.org&gt;
+<p>
 
 <hr><p>
 <a name='toc'><b>Table of Contents</b></a><p>
diff --git a/runit-2.1.1/doc/svlogd.8.html b/runit-2.1.2/doc/svlogd.8.html
index 9d300ae..9d300ae 100644
--- a/runit-2.1.1/doc/svlogd.8.html
+++ b/runit-2.1.2/doc/svlogd.8.html
diff --git a/runit-2.1.1/doc/upgrade.html b/runit-2.1.2/doc/upgrade.html
index 6e99a3a..83d12e1 100644
--- a/runit-2.1.1/doc/upgrade.html
+++ b/runit-2.1.2/doc/upgrade.html
@@ -9,7 +9,7 @@
 <hr>
 <h1>runit - upgrading from previous versions</h1>
 <hr>
-<h3>2.0.0 to 2.1.1</h3>
+<h3>2.0.0 to 2.1.2</h3>
 The <a href="chpst.8.html">chpst</a> program learned a new option -b to run
 a program with a different name as the 0th argument.
 <h3>1.9.0 to 2.0.0</h3>
diff --git a/runit-2.1.1/doc/usedietlibc.html b/runit-2.1.2/doc/usedietlibc.html
index 70c5b2f..70c5b2f 100644
--- a/runit-2.1.1/doc/usedietlibc.html
+++ b/runit-2.1.2/doc/usedietlibc.html
diff --git a/runit-2.1.1/doc/useinit.html b/runit-2.1.2/doc/useinit.html
index 58adec2..a5c2853 100644
--- a/runit-2.1.1/doc/useinit.html
+++ b/runit-2.1.2/doc/useinit.html
@@ -48,21 +48,22 @@ and tell <i>init</i> to re-read its configuration, e.g.:
 <a name="upstart"><h2>Using with sysvinit and upstart</h2></a>
 If your system uses a sysvinit alike init scheme that utilizes upstart
 instead of inittab, and which has start and stop scripts located in
-<tt>/etc/event.d</tt>, do:
+<tt>/etc/init/</tt>, do:
 <pre>
- # cat >/etc/event.d/SV <<\EOT
- # for runit - manage /sbin/runsvdir-start
- start on runlevel-2
- start on runlevel-3
- start on runlevel-4
- start on runlevel-5
+ # cat >/etc/init/runsvdir.conf <<\EOT
+ # for runit - manage /usr/sbin/runsvdir-start
+ start on runlevel 2
+ start on runlevel 3
+ start on runlevel 4
+ start on runlevel 5
  stop on shutdown
- respawn /sbin/runsvdir-start
+ respawn
+ exec /usr/sbin/runsvdir-start
  EOT
 </pre>
-and tell init to re-read its configuration, e.g.:
+and tell init to start the new service, e.g.:
 <pre>
- # init q
+ # start runsvdir
 </pre>
 <hr>
 <a name="bsd"><h2>Using with *BSD init</h2></a>
diff --git a/runit-2.1.1/doc/utmpset.8.html b/runit-2.1.2/doc/utmpset.8.html
index 3b96cb6..3b96cb6 100644
--- a/runit-2.1.1/doc/utmpset.8.html
+++ b/runit-2.1.2/doc/utmpset.8.html
diff --git a/runit-2.1.1/etc/2 b/runit-2.1.2/etc/2
index 3bb822d..3bb822d 100755
--- a/runit-2.1.1/etc/2
+++ b/runit-2.1.2/etc/2
diff --git a/runit-2.1.1/etc/debian/1 b/runit-2.1.2/etc/debian/1
index 4cd10cb..4cd10cb 100755
--- a/runit-2.1.1/etc/debian/1
+++ b/runit-2.1.2/etc/debian/1
diff --git a/runit-2.1.1/etc/debian/2 b/runit-2.1.2/etc/debian/2
index 5fae01f..5fae01f 120000
--- a/runit-2.1.1/etc/debian/2
+++ b/runit-2.1.2/etc/debian/2
diff --git a/runit-2.1.1/etc/debian/3 b/runit-2.1.2/etc/debian/3
index 10354d7..10354d7 100755
--- a/runit-2.1.1/etc/debian/3
+++ b/runit-2.1.2/etc/debian/3
diff --git a/runit-2.1.1/etc/debian/ctrlaltdel b/runit-2.1.2/etc/debian/ctrlaltdel
index 6684457..6684457 100755
--- a/runit-2.1.1/etc/debian/ctrlaltdel
+++ b/runit-2.1.2/etc/debian/ctrlaltdel
diff --git a/runit-2.1.1/etc/debian/getty-tty5/finish b/runit-2.1.2/etc/debian/getty-tty5/finish
index 72d719b..72d719b 100755
--- a/runit-2.1.1/etc/debian/getty-tty5/finish
+++ b/runit-2.1.2/etc/debian/getty-tty5/finish
diff --git a/runit-2.1.1/etc/debian/getty-tty5/run b/runit-2.1.2/etc/debian/getty-tty5/run
index 6767eae..6767eae 100755
--- a/runit-2.1.1/etc/debian/getty-tty5/run
+++ b/runit-2.1.2/etc/debian/getty-tty5/run
diff --git a/runit-2.1.1/etc/freebsd/1 b/runit-2.1.2/etc/freebsd/1
index 2a4492d..2a4492d 100755
--- a/runit-2.1.1/etc/freebsd/1
+++ b/runit-2.1.2/etc/freebsd/1
diff --git a/runit-2.1.1/etc/freebsd/2 b/runit-2.1.2/etc/freebsd/2
index 5fae01f..5fae01f 120000
--- a/runit-2.1.1/etc/freebsd/2
+++ b/runit-2.1.2/etc/freebsd/2
diff --git a/runit-2.1.1/etc/freebsd/3 b/runit-2.1.2/etc/freebsd/3
index f7f9327..f7f9327 100755
--- a/runit-2.1.1/etc/freebsd/3
+++ b/runit-2.1.2/etc/freebsd/3
diff --git a/runit-2.1.1/etc/freebsd/ctrlaltdel b/runit-2.1.2/etc/freebsd/ctrlaltdel
index 6684457..6684457 100755
--- a/runit-2.1.1/etc/freebsd/ctrlaltdel
+++ b/runit-2.1.2/etc/freebsd/ctrlaltdel
diff --git a/runit-2.1.1/etc/freebsd/getty-ttyv4/finish b/runit-2.1.2/etc/freebsd/getty-ttyv4/finish
index b53d0af..b53d0af 100755
--- a/runit-2.1.1/etc/freebsd/getty-ttyv4/finish
+++ b/runit-2.1.2/etc/freebsd/getty-ttyv4/finish
diff --git a/runit-2.1.1/etc/freebsd/getty-ttyv4/run b/runit-2.1.2/etc/freebsd/getty-ttyv4/run
index 2d5e3dc..2d5e3dc 100755
--- a/runit-2.1.1/etc/freebsd/getty-ttyv4/run
+++ b/runit-2.1.2/etc/freebsd/getty-ttyv4/run
diff --git a/runit-2.1.1/etc/macosx/2 b/runit-2.1.2/etc/macosx/2
index 5fae01f..5fae01f 120000
--- a/runit-2.1.1/etc/macosx/2
+++ b/runit-2.1.2/etc/macosx/2
diff --git a/runit-2.1.1/etc/macosx/StartupItems/StartupParameters.plist b/runit-2.1.2/etc/macosx/StartupItems/StartupParameters.plist
index 14b5116..14b5116 100644
--- a/runit-2.1.1/etc/macosx/StartupItems/StartupParameters.plist
+++ b/runit-2.1.2/etc/macosx/StartupItems/StartupParameters.plist
diff --git a/runit-2.1.1/etc/macosx/StartupItems/runit b/runit-2.1.2/etc/macosx/StartupItems/runit
index 9f0eaf3..9f0eaf3 100755
--- a/runit-2.1.1/etc/macosx/StartupItems/runit
+++ b/runit-2.1.2/etc/macosx/StartupItems/runit
diff --git a/runit-2.1.1/etc/macosx/org.smarden.runit.plist b/runit-2.1.2/etc/macosx/org.smarden.runit.plist
index 1331f8a..1331f8a 100644
--- a/runit-2.1.1/etc/macosx/org.smarden.runit.plist
+++ b/runit-2.1.2/etc/macosx/org.smarden.runit.plist
diff --git a/runit-2.1.1/etc/openbsd/1 b/runit-2.1.2/etc/openbsd/1
index eaa3d39..eaa3d39 100755
--- a/runit-2.1.1/etc/openbsd/1
+++ b/runit-2.1.2/etc/openbsd/1
diff --git a/runit-2.1.1/etc/openbsd/2 b/runit-2.1.2/etc/openbsd/2
index 5fae01f..5fae01f 120000
--- a/runit-2.1.1/etc/openbsd/2
+++ b/runit-2.1.2/etc/openbsd/2
diff --git a/runit-2.1.1/etc/openbsd/3 b/runit-2.1.2/etc/openbsd/3
index f7f9327..f7f9327 100755
--- a/runit-2.1.1/etc/openbsd/3
+++ b/runit-2.1.2/etc/openbsd/3
diff --git a/runit-2.1.1/etc/openbsd/ctrlaltdel b/runit-2.1.2/etc/openbsd/ctrlaltdel
index 6684457..6684457 100755
--- a/runit-2.1.1/etc/openbsd/ctrlaltdel
+++ b/runit-2.1.2/etc/openbsd/ctrlaltdel
diff --git a/runit-2.1.1/etc/openbsd/getty-ttyC4/finish b/runit-2.1.2/etc/openbsd/getty-ttyC4/finish
index b3c7aa7..b3c7aa7 100755
--- a/runit-2.1.1/etc/openbsd/getty-ttyC4/finish
+++ b/runit-2.1.2/etc/openbsd/getty-ttyC4/finish
diff --git a/runit-2.1.1/etc/openbsd/getty-ttyC4/run b/runit-2.1.2/etc/openbsd/getty-ttyC4/run
index c1d9cb9..c1d9cb9 100755
--- a/runit-2.1.1/etc/openbsd/getty-ttyC4/run
+++ b/runit-2.1.2/etc/openbsd/getty-ttyC4/run
diff --git a/runit-2.1.1/man/chpst.8 b/runit-2.1.2/man/chpst.8
index 43c0b8d..43c0b8d 100644
--- a/runit-2.1.1/man/chpst.8
+++ b/runit-2.1.2/man/chpst.8
diff --git a/runit-2.1.1/man/runit-init.8 b/runit-2.1.2/man/runit-init.8
index 4ea33c2..4ea33c2 100644
--- a/runit-2.1.1/man/runit-init.8
+++ b/runit-2.1.2/man/runit-init.8
diff --git a/runit-2.1.1/man/runit.8 b/runit-2.1.2/man/runit.8
index a53cf6e..a53cf6e 100644
--- a/runit-2.1.1/man/runit.8
+++ b/runit-2.1.2/man/runit.8
diff --git a/runit-2.1.1/man/runsv.8 b/runit-2.1.2/man/runsv.8
index 7c5abfc..7c5abfc 100644
--- a/runit-2.1.1/man/runsv.8
+++ b/runit-2.1.2/man/runsv.8
diff --git a/runit-2.1.1/man/runsvchdir.8 b/runit-2.1.2/man/runsvchdir.8
index f7f94dc..f7f94dc 100644
--- a/runit-2.1.1/man/runsvchdir.8
+++ b/runit-2.1.2/man/runsvchdir.8
diff --git a/runit-2.1.1/man/runsvdir.8 b/runit-2.1.2/man/runsvdir.8
index adfa587..adfa587 100644
--- a/runit-2.1.1/man/runsvdir.8
+++ b/runit-2.1.2/man/runsvdir.8
diff --git a/runit-2.1.1/man/sv.8 b/runit-2.1.2/man/sv.8
index 9bc005a..7ed9852 100644
--- a/runit-2.1.1/man/sv.8
+++ b/runit-2.1.2/man/sv.8
@@ -75,8 +75,9 @@ Do not restart the service.
 If the service is down, and no log service exists,
 .BR runsv (8)
 exits.
-If the service is down and a log service exists, send the TERM signal to the
-log service.
+If the service is down and a log service exists,
+.BR runsv (8)
+closes the standard input of the log service and waits for it to terminate.
 If the log service is down,
 .BR runsv (8)
 exits.
@@ -111,6 +112,11 @@ Same as
 but wait up to 7 seconds for the service to become down.
 Then report the status or timeout.
 .TP
+.B reload
+Same as
+.IR hup ,
+and additionally report the status afterwards.
+.TP
 .B restart
 Send the commands
 .IR term ,
@@ -182,6 +188,15 @@ process to terminate.
 Then report the status, and on timeout send the service the
 .I kill
 command.
+.TP
+.B try-restart
+if the service is running, send it the
+.I term
+and
+.I cont
+commands, and wait up to 7 seconds for the service to restart.
+Then report the status or timeout.
+
 .SS Additional Commands
 .TP
 .B check
diff --git a/runit-2.1.1/man/svlogd.8 b/runit-2.1.2/man/svlogd.8
index 01b2324..01b2324 100644
--- a/runit-2.1.1/man/svlogd.8
+++ b/runit-2.1.2/man/svlogd.8
diff --git a/runit-2.1.1/man/utmpset.8 b/runit-2.1.2/man/utmpset.8
index 4f9b4ef..4f9b4ef 100644
--- a/runit-2.1.1/man/utmpset.8
+++ b/runit-2.1.2/man/utmpset.8
diff --git a/runit-2.1.1/package/CHANGES b/runit-2.1.2/package/CHANGES
index 23ae04d..da4ea27 100644
--- a/runit-2.1.1/package/CHANGES
+++ b/runit-2.1.2/package/CHANGES
@@ -1,3 +1,25 @@
+2.1.2
+Sun, 10 Aug 2014 18:01:54 +0000
+  * doc/index.html: reorder, cleanup links to distributions; add Linux
+    from Scratch, Finnix, VServer.
+  * sv.c: properly format status command's output on failure cases.
+  * sv.c: support optional LSB init script actions reload and
+    try-restart.
+  * man/sv.8: "sv exit" does not send a TERM signal to the log service
+    (thx Jonathan Nieder).
+  * fmt_ptime.c: 64 bits time_t fix for svlogd (tnx Jérémie
+    Courrèges-Anglas).
+  * sv.c: fix typo that may lead to wrong output from sv when reporting
+    status of multiple service directories.
+  * doc/index.html: add deepOfix Mail Server to list of distributions
+    that include runit (thx Debayan Banerjee).
+  * doc/useinit.html: update description on how to use with upstart
+    (thx Gabriel de Perthuis).
+  * doc/index.html: add Dragora GNU/Linux to list of distributions that
+    use runit as default init scheme (thx Matias A. Fonzo).
+  * doc/index.html: add ArchLinux to list of distributions that include
+    runit (thx Kevin Berry).
+
 2.1.1
 Sun, 04 Oct 2009 20:28:38 +0000
   * doc/upgrade.html: fix typo.
diff --git a/runit-2.1.1/package/COPYING b/runit-2.1.2/package/COPYING
index d24d1d2..d24d1d2 100644
--- a/runit-2.1.1/package/COPYING
+++ b/runit-2.1.2/package/COPYING
diff --git a/runit-2.1.1/package/README b/runit-2.1.2/package/README
index 430fac5..430fac5 100644
--- a/runit-2.1.1/package/README
+++ b/runit-2.1.2/package/README
diff --git a/runit-2.1.1/package/THANKS b/runit-2.1.2/package/THANKS
index b84e3fe..b84e3fe 100644
--- a/runit-2.1.1/package/THANKS
+++ b/runit-2.1.2/package/THANKS
diff --git a/runit-2.1.1/package/TODO b/runit-2.1.2/package/TODO
index 6c2bd6c..6c2bd6c 100644
--- a/runit-2.1.1/package/TODO
+++ b/runit-2.1.2/package/TODO
diff --git a/runit-2.1.1/package/check b/runit-2.1.2/package/check
index 7662e74..7662e74 100755
--- a/runit-2.1.1/package/check
+++ b/runit-2.1.2/package/check
diff --git a/runit-2.1.1/package/commands b/runit-2.1.2/package/commands
index 043d245..043d245 100644
--- a/runit-2.1.1/package/commands
+++ b/runit-2.1.2/package/commands
diff --git a/runit-2.1.1/package/compile b/runit-2.1.2/package/compile
index 0ed142e..0ed142e 100755
--- a/runit-2.1.1/package/compile
+++ b/runit-2.1.2/package/compile
diff --git a/runit-2.1.1/package/install b/runit-2.1.2/package/install
index 4e3c468..4e3c468 100755
--- a/runit-2.1.1/package/install
+++ b/runit-2.1.2/package/install
diff --git a/runit-2.1.1/package/install-man b/runit-2.1.2/package/install-man
index cd49048..cd49048 100755
--- a/runit-2.1.1/package/install-man
+++ b/runit-2.1.2/package/install-man
diff --git a/runit-2.1.1/package/sharing b/runit-2.1.2/package/sharing
index 303d3de..303d3de 100644
--- a/runit-2.1.1/package/sharing
+++ b/runit-2.1.2/package/sharing
diff --git a/runit-2.1.1/package/upgrade b/runit-2.1.2/package/upgrade
index 96f57b2..fac8902 100755
--- a/runit-2.1.1/package/upgrade
+++ b/runit-2.1.2/package/upgrade
@@ -8,9 +8,9 @@ test -d src || sh -cx '! : Wrong working directory.'
 here=`env - PATH=$PATH pwd`
 parent=`dirname $here`
 
-echo 'Creating symlink runit -> runit-2.1.1...'
+echo 'Creating symlink runit -> runit-2.1.2...'
 rm -f runit
-ln -s runit-2.1.1 runit
+ln -s runit-2.1.2 runit
 mv -f runit ..
 
 echo 'Making command links in /command...'
diff --git a/runit-2.1.1/package/versions b/runit-2.1.2/package/versions
index 223b527..f1364f2 100644
--- a/runit-2.1.1/package/versions
+++ b/runit-2.1.2/package/versions
@@ -51,3 +51,4 @@
 2.0.0
 2.1.0
 2.1.1
+2.1.2
diff --git a/runit-2.1.1/src/Makefile b/runit-2.1.2/src/Makefile
index d9624de..d9624de 100644
--- a/runit-2.1.1/src/Makefile
+++ b/runit-2.1.2/src/Makefile
diff --git a/runit-2.1.1/src/TARGETS b/runit-2.1.2/src/TARGETS
index 46981ce..46981ce 100644
--- a/runit-2.1.1/src/TARGETS
+++ b/runit-2.1.2/src/TARGETS
diff --git a/runit-2.1.1/src/alloc.c b/runit-2.1.2/src/alloc.c
index c741aa4..c741aa4 100644
--- a/runit-2.1.1/src/alloc.c
+++ b/runit-2.1.2/src/alloc.c
diff --git a/runit-2.1.1/src/alloc.h b/runit-2.1.2/src/alloc.h
index 21122fc..21122fc 100644
--- a/runit-2.1.1/src/alloc.h
+++ b/runit-2.1.2/src/alloc.h
diff --git a/runit-2.1.1/src/alloc_re.c b/runit-2.1.2/src/alloc_re.c
index 1074609..1074609 100644
--- a/runit-2.1.1/src/alloc_re.c
+++ b/runit-2.1.2/src/alloc_re.c
diff --git a/runit-2.1.1/src/buffer.c b/runit-2.1.2/src/buffer.c
index 38e6d77..38e6d77 100644
--- a/runit-2.1.1/src/buffer.c
+++ b/runit-2.1.2/src/buffer.c
diff --git a/runit-2.1.1/src/buffer.h b/runit-2.1.2/src/buffer.h
index 8f2e572..8f2e572 100644
--- a/runit-2.1.1/src/buffer.h
+++ b/runit-2.1.2/src/buffer.h
diff --git a/runit-2.1.1/src/buffer_0.c b/runit-2.1.2/src/buffer_0.c
index 47d3263..47d3263 100644
--- a/runit-2.1.1/src/buffer_0.c
+++ b/runit-2.1.2/src/buffer_0.c
diff --git a/runit-2.1.1/src/buffer_1.c b/runit-2.1.2/src/buffer_1.c
index f4bac3d..f4bac3d 100644
--- a/runit-2.1.1/src/buffer_1.c
+++ b/runit-2.1.2/src/buffer_1.c
diff --git a/runit-2.1.1/src/buffer_2.c b/runit-2.1.2/src/buffer_2.c
index f255a92..f255a92 100644
--- a/runit-2.1.1/src/buffer_2.c
+++ b/runit-2.1.2/src/buffer_2.c
diff --git a/runit-2.1.1/src/buffer_get.c b/runit-2.1.2/src/buffer_get.c
index 3a6e1b6..3a6e1b6 100644
--- a/runit-2.1.1/src/buffer_get.c
+++ b/runit-2.1.2/src/buffer_get.c
diff --git a/runit-2.1.1/src/buffer_put.c b/runit-2.1.2/src/buffer_put.c
index 23164b3..23164b3 100644
--- a/runit-2.1.1/src/buffer_put.c
+++ b/runit-2.1.2/src/buffer_put.c
diff --git a/runit-2.1.1/src/buffer_read.c b/runit-2.1.2/src/buffer_read.c
index 09db05f..09db05f 100644
--- a/runit-2.1.1/src/buffer_read.c
+++ b/runit-2.1.2/src/buffer_read.c
diff --git a/runit-2.1.1/src/buffer_write.c b/runit-2.1.2/src/buffer_write.c
index 4ba13ef..4ba13ef 100644
--- a/runit-2.1.1/src/buffer_write.c
+++ b/runit-2.1.2/src/buffer_write.c
diff --git a/runit-2.1.1/src/byte.h b/runit-2.1.2/src/byte.h
index 09aab61..09aab61 100644
--- a/runit-2.1.1/src/byte.h
+++ b/runit-2.1.2/src/byte.h
diff --git a/runit-2.1.1/src/byte_chr.c b/runit-2.1.2/src/byte_chr.c
index fd56056..fd56056 100644
--- a/runit-2.1.1/src/byte_chr.c
+++ b/runit-2.1.2/src/byte_chr.c
diff --git a/runit-2.1.1/src/byte_copy.c b/runit-2.1.2/src/byte_copy.c
index 74c9e4a..74c9e4a 100644
--- a/runit-2.1.1/src/byte_copy.c
+++ b/runit-2.1.2/src/byte_copy.c
diff --git a/runit-2.1.1/src/byte_cr.c b/runit-2.1.2/src/byte_cr.c
index 52dc251..52dc251 100644
--- a/runit-2.1.1/src/byte_cr.c
+++ b/runit-2.1.2/src/byte_cr.c
diff --git a/runit-2.1.1/src/byte_diff.c b/runit-2.1.2/src/byte_diff.c
index 0c4d17b..0c4d17b 100644
--- a/runit-2.1.1/src/byte_diff.c
+++ b/runit-2.1.2/src/byte_diff.c
diff --git a/runit-2.1.1/src/byte_rchr.c b/runit-2.1.2/src/byte_rchr.c
index 7ea9948..7ea9948 100644
--- a/runit-2.1.1/src/byte_rchr.c
+++ b/runit-2.1.2/src/byte_rchr.c
diff --git a/runit-2.1.1/src/check-diff b/runit-2.1.2/src/check-diff
index d334238..d334238 100755
--- a/runit-2.1.1/src/check-diff
+++ b/runit-2.1.2/src/check-diff
diff --git a/runit-2.1.1/src/check-dist b/runit-2.1.2/src/check-dist
index f0c5dd5..f0c5dd5 100755
--- a/runit-2.1.1/src/check-dist
+++ b/runit-2.1.2/src/check-dist
diff --git a/runit-2.1.1/src/check-local b/runit-2.1.2/src/check-local
index 36b3ed4..36b3ed4 100755
--- a/runit-2.1.1/src/check-local
+++ b/runit-2.1.2/src/check-local
diff --git a/runit-2.1.1/src/chkshsgr.c b/runit-2.1.2/src/chkshsgr.c
index 38c352d..38c352d 100644
--- a/runit-2.1.1/src/chkshsgr.c
+++ b/runit-2.1.2/src/chkshsgr.c
diff --git a/runit-2.1.1/src/choose.sh b/runit-2.1.2/src/choose.sh
index feff2da..feff2da 100644
--- a/runit-2.1.1/src/choose.sh
+++ b/runit-2.1.2/src/choose.sh
diff --git a/runit-2.1.1/src/chpst.c b/runit-2.1.2/src/chpst.c
index f1b8ed9..f1b8ed9 100644
--- a/runit-2.1.1/src/chpst.c
+++ b/runit-2.1.2/src/chpst.c
diff --git a/runit-2.1.1/src/chpst.check b/runit-2.1.2/src/chpst.check
index 384113e..384113e 100755
--- a/runit-2.1.1/src/chpst.check
+++ b/runit-2.1.2/src/chpst.check
diff --git a/runit-2.1.1/src/chpst.dist b/runit-2.1.2/src/chpst.dist
index 6779bfd..6779bfd 100644
--- a/runit-2.1.1/src/chpst.dist
+++ b/runit-2.1.2/src/chpst.dist
diff --git a/runit-2.1.1/src/coe.c b/runit-2.1.2/src/coe.c
index 50b2397..50b2397 100644
--- a/runit-2.1.1/src/coe.c
+++ b/runit-2.1.2/src/coe.c
diff --git a/runit-2.1.1/src/coe.h b/runit-2.1.2/src/coe.h
index b17db54..b17db54 100644
--- a/runit-2.1.1/src/coe.h
+++ b/runit-2.1.2/src/coe.h
diff --git a/runit-2.1.1/src/conf-cc b/runit-2.1.2/src/conf-cc
index 984024f..984024f 100644
--- a/runit-2.1.1/src/conf-cc
+++ b/runit-2.1.2/src/conf-cc
diff --git a/runit-2.1.1/src/conf-ld b/runit-2.1.2/src/conf-ld
index 59a0de7..59a0de7 100644
--- a/runit-2.1.1/src/conf-ld
+++ b/runit-2.1.2/src/conf-ld
diff --git a/runit-2.1.1/src/direntry.h1 b/runit-2.1.2/src/direntry.h1
index 6cb088d..6cb088d 100644
--- a/runit-2.1.1/src/direntry.h1
+++ b/runit-2.1.2/src/direntry.h1
diff --git a/runit-2.1.1/src/direntry.h2 b/runit-2.1.2/src/direntry.h2
index bfd4d19..bfd4d19 100644
--- a/runit-2.1.1/src/direntry.h2
+++ b/runit-2.1.2/src/direntry.h2
diff --git a/runit-2.1.1/src/env.c b/runit-2.1.2/src/env.c
index 1b3ef62..1b3ef62 100644
--- a/runit-2.1.1/src/env.c
+++ b/runit-2.1.2/src/env.c
diff --git a/runit-2.1.1/src/env.h b/runit-2.1.2/src/env.h
index 834d331..834d331 100644
--- a/runit-2.1.1/src/env.h
+++ b/runit-2.1.2/src/env.h
diff --git a/runit-2.1.1/src/error.c b/runit-2.1.2/src/error.c
index ea5f9c2..ea5f9c2 100644
--- a/runit-2.1.1/src/error.c
+++ b/runit-2.1.2/src/error.c
diff --git a/runit-2.1.1/src/error.h b/runit-2.1.2/src/error.h
index 8ecb400..8ecb400 100644
--- a/runit-2.1.1/src/error.h
+++ b/runit-2.1.2/src/error.h
diff --git a/runit-2.1.1/src/error_str.c b/runit-2.1.2/src/error_str.c
index e002efe..e002efe 100644
--- a/runit-2.1.1/src/error_str.c
+++ b/runit-2.1.2/src/error_str.c
diff --git a/runit-2.1.1/src/fd.h b/runit-2.1.2/src/fd.h
index 1c7a035..1c7a035 100644
--- a/runit-2.1.1/src/fd.h
+++ b/runit-2.1.2/src/fd.h
diff --git a/runit-2.1.1/src/fd_copy.c b/runit-2.1.2/src/fd_copy.c
index 80e9d15..80e9d15 100644
--- a/runit-2.1.1/src/fd_copy.c
+++ b/runit-2.1.2/src/fd_copy.c
diff --git a/runit-2.1.1/src/fd_move.c b/runit-2.1.2/src/fd_move.c
index 49f723f..49f723f 100644
--- a/runit-2.1.1/src/fd_move.c
+++ b/runit-2.1.2/src/fd_move.c
diff --git a/runit-2.1.1/src/fifo.c b/runit-2.1.2/src/fifo.c
index c14f683..c14f683 100644
--- a/runit-2.1.1/src/fifo.c
+++ b/runit-2.1.2/src/fifo.c
diff --git a/runit-2.1.1/src/fifo.h b/runit-2.1.2/src/fifo.h
index ba75678..ba75678 100644
--- a/runit-2.1.1/src/fifo.h
+++ b/runit-2.1.2/src/fifo.h
diff --git a/runit-2.1.1/src/find-systype.sh b/runit-2.1.2/src/find-systype.sh
index 9f6e565..9f6e565 100644
--- a/runit-2.1.1/src/find-systype.sh
+++ b/runit-2.1.2/src/find-systype.sh
diff --git a/runit-2.1.1/src/fmt.h b/runit-2.1.2/src/fmt.h
index 8847fa6..8847fa6 100644
--- a/runit-2.1.1/src/fmt.h
+++ b/runit-2.1.2/src/fmt.h
diff --git a/runit-2.1.1/src/fmt_ptime.c b/runit-2.1.2/src/fmt_ptime.c
index e538b35..2ab5725 100644
--- a/runit-2.1.1/src/fmt_ptime.c
+++ b/runit-2.1.2/src/fmt_ptime.c
@@ -4,7 +4,7 @@
 
 unsigned int fmt_ptime2(char *s, struct taia *ta, char sep) {
   struct tm *t;
-  unsigned long u;
+  time_t u;
 
   if (ta->sec.x < 4611686018427387914ULL) return(0); /* impossible? */
   u =ta->sec.x -4611686018427387914ULL;
diff --git a/runit-2.1.1/src/fmt_ptime.h b/runit-2.1.2/src/fmt_ptime.h
index 72ea008..72ea008 100644
--- a/runit-2.1.1/src/fmt_ptime.h
+++ b/runit-2.1.2/src/fmt_ptime.h
diff --git a/runit-2.1.1/src/fmt_uint.c b/runit-2.1.2/src/fmt_uint.c
index b8ec0b7..b8ec0b7 100644
--- a/runit-2.1.1/src/fmt_uint.c
+++ b/runit-2.1.2/src/fmt_uint.c
diff --git a/runit-2.1.1/src/fmt_uint0.c b/runit-2.1.2/src/fmt_uint0.c
index 728a5aa..728a5aa 100644
--- a/runit-2.1.1/src/fmt_uint0.c
+++ b/runit-2.1.2/src/fmt_uint0.c
diff --git a/runit-2.1.1/src/fmt_ulong.c b/runit-2.1.2/src/fmt_ulong.c
index 168572f..168572f 100644
--- a/runit-2.1.1/src/fmt_ulong.c
+++ b/runit-2.1.2/src/fmt_ulong.c
diff --git a/runit-2.1.1/src/gen_alloc.h b/runit-2.1.2/src/gen_alloc.h
index bd55e5b..bd55e5b 100644
--- a/runit-2.1.1/src/gen_alloc.h
+++ b/runit-2.1.2/src/gen_alloc.h
diff --git a/runit-2.1.1/src/gen_allocdefs.h b/runit-2.1.2/src/gen_allocdefs.h
index 3afd92b..3afd92b 100644
--- a/runit-2.1.1/src/gen_allocdefs.h
+++ b/runit-2.1.2/src/gen_allocdefs.h
diff --git a/runit-2.1.1/src/hasflock.h1 b/runit-2.1.2/src/hasflock.h1
index ac7dfc3..ac7dfc3 100644
--- a/runit-2.1.1/src/hasflock.h1
+++ b/runit-2.1.2/src/hasflock.h1
diff --git a/runit-2.1.1/src/hasflock.h2 b/runit-2.1.2/src/hasflock.h2
index 1878f64..1878f64 100644
--- a/runit-2.1.1/src/hasflock.h2
+++ b/runit-2.1.2/src/hasflock.h2
diff --git a/runit-2.1.1/src/hasmkffo.h1 b/runit-2.1.2/src/hasmkffo.h1
index a562451..a562451 100644
--- a/runit-2.1.1/src/hasmkffo.h1
+++ b/runit-2.1.2/src/hasmkffo.h1
diff --git a/runit-2.1.1/src/hasmkffo.h2 b/runit-2.1.2/src/hasmkffo.h2
index 8ac8943..8ac8943 100644
--- a/runit-2.1.1/src/hasmkffo.h2
+++ b/runit-2.1.2/src/hasmkffo.h2
diff --git a/runit-2.1.1/src/hassgact.h1 b/runit-2.1.2/src/hassgact.h1
index 7639d24..7639d24 100644
--- a/runit-2.1.1/src/hassgact.h1
+++ b/runit-2.1.2/src/hassgact.h1
diff --git a/runit-2.1.1/src/hassgact.h2 b/runit-2.1.2/src/hassgact.h2
index 60ff776..60ff776 100644
--- a/runit-2.1.1/src/hassgact.h2
+++ b/runit-2.1.2/src/hassgact.h2
diff --git a/runit-2.1.1/src/hassgprm.h1 b/runit-2.1.2/src/hassgprm.h1
index ef3eee9..ef3eee9 100644
--- a/runit-2.1.1/src/hassgprm.h1
+++ b/runit-2.1.2/src/hassgprm.h1
diff --git a/runit-2.1.1/src/hassgprm.h2 b/runit-2.1.2/src/hassgprm.h2
index be9d0d7..be9d0d7 100644
--- a/runit-2.1.1/src/hassgprm.h2
+++ b/runit-2.1.2/src/hassgprm.h2
diff --git a/runit-2.1.1/src/hasshsgr.h1 b/runit-2.1.2/src/hasshsgr.h1
index 3806277..3806277 100644
--- a/runit-2.1.1/src/hasshsgr.h1
+++ b/runit-2.1.2/src/hasshsgr.h1
diff --git a/runit-2.1.1/src/hasshsgr.h2 b/runit-2.1.2/src/hasshsgr.h2
index 5624ed0..5624ed0 100644
--- a/runit-2.1.1/src/hasshsgr.h2
+++ b/runit-2.1.2/src/hasshsgr.h2
diff --git a/runit-2.1.1/src/haswaitp.h1 b/runit-2.1.2/src/haswaitp.h1
index 0d6f82c..0d6f82c 100644
--- a/runit-2.1.1/src/haswaitp.h1
+++ b/runit-2.1.2/src/haswaitp.h1
diff --git a/runit-2.1.1/src/haswaitp.h2 b/runit-2.1.2/src/haswaitp.h2
index 015413f..015413f 100644
--- a/runit-2.1.1/src/haswaitp.h2
+++ b/runit-2.1.2/src/haswaitp.h2
diff --git a/runit-2.1.1/src/iopause.c b/runit-2.1.2/src/iopause.c
index ea5a426..ea5a426 100644
--- a/runit-2.1.1/src/iopause.c
+++ b/runit-2.1.2/src/iopause.c
diff --git a/runit-2.1.1/src/iopause.h1 b/runit-2.1.2/src/iopause.h1
index 5c53de7..5c53de7 100644
--- a/runit-2.1.1/src/iopause.h1
+++ b/runit-2.1.2/src/iopause.h1
diff --git a/runit-2.1.1/src/iopause.h2 b/runit-2.1.2/src/iopause.h2
index 8e58452..8e58452 100644
--- a/runit-2.1.1/src/iopause.h2
+++ b/runit-2.1.2/src/iopause.h2
diff --git a/runit-2.1.1/src/lock.h b/runit-2.1.2/src/lock.h
index 4a96cdc..4a96cdc 100644
--- a/runit-2.1.1/src/lock.h
+++ b/runit-2.1.2/src/lock.h
diff --git a/runit-2.1.1/src/lock_ex.c b/runit-2.1.2/src/lock_ex.c
index b75a764..b75a764 100644
--- a/runit-2.1.1/src/lock_ex.c
+++ b/runit-2.1.2/src/lock_ex.c
diff --git a/runit-2.1.1/src/lock_exnb.c b/runit-2.1.2/src/lock_exnb.c
index 9ec2b9c..9ec2b9c 100644
--- a/runit-2.1.1/src/lock_exnb.c
+++ b/runit-2.1.2/src/lock_exnb.c
diff --git a/runit-2.1.1/src/ndelay.h b/runit-2.1.2/src/ndelay.h
index dbe91b2..dbe91b2 100644
--- a/runit-2.1.1/src/ndelay.h
+++ b/runit-2.1.2/src/ndelay.h
diff --git a/runit-2.1.1/src/ndelay_off.c b/runit-2.1.2/src/ndelay_off.c
index 92d3244..92d3244 100644
--- a/runit-2.1.1/src/ndelay_off.c
+++ b/runit-2.1.2/src/ndelay_off.c
diff --git a/runit-2.1.1/src/ndelay_on.c b/runit-2.1.2/src/ndelay_on.c
index b96a6b2..b96a6b2 100644
--- a/runit-2.1.1/src/ndelay_on.c
+++ b/runit-2.1.2/src/ndelay_on.c
diff --git a/runit-2.1.1/src/open.h b/runit-2.1.2/src/open.h
index 9939663..9939663 100644
--- a/runit-2.1.1/src/open.h
+++ b/runit-2.1.2/src/open.h
diff --git a/runit-2.1.1/src/open_append.c b/runit-2.1.2/src/open_append.c
index d1b241b..d1b241b 100644
--- a/runit-2.1.1/src/open_append.c
+++ b/runit-2.1.2/src/open_append.c
diff --git a/runit-2.1.1/src/open_read.c b/runit-2.1.2/src/open_read.c
index 99b3cd1..99b3cd1 100644
--- a/runit-2.1.1/src/open_read.c
+++ b/runit-2.1.2/src/open_read.c
diff --git a/runit-2.1.1/src/open_trunc.c b/runit-2.1.2/src/open_trunc.c
index 6e0c4c2..6e0c4c2 100644
--- a/runit-2.1.1/src/open_trunc.c
+++ b/runit-2.1.2/src/open_trunc.c
diff --git a/runit-2.1.1/src/open_write.c b/runit-2.1.2/src/open_write.c
index 34cfa9b..34cfa9b 100644
--- a/runit-2.1.1/src/open_write.c
+++ b/runit-2.1.2/src/open_write.c
diff --git a/runit-2.1.1/src/openreadclose.c b/runit-2.1.2/src/openreadclose.c
index 635933b..635933b 100644
--- a/runit-2.1.1/src/openreadclose.c
+++ b/runit-2.1.2/src/openreadclose.c
diff --git a/runit-2.1.1/src/openreadclose.h b/runit-2.1.2/src/openreadclose.h
index 728899c..728899c 100644
--- a/runit-2.1.1/src/openreadclose.h
+++ b/runit-2.1.2/src/openreadclose.h
diff --git a/runit-2.1.1/src/pathexec.h b/runit-2.1.2/src/pathexec.h
index d46ab17..d46ab17 100644
--- a/runit-2.1.1/src/pathexec.h
+++ b/runit-2.1.2/src/pathexec.h
diff --git a/runit-2.1.1/src/pathexec_env.c b/runit-2.1.2/src/pathexec_env.c
index 1305469..1305469 100644
--- a/runit-2.1.1/src/pathexec_env.c
+++ b/runit-2.1.2/src/pathexec_env.c
diff --git a/runit-2.1.1/src/pathexec_run.c b/runit-2.1.2/src/pathexec_run.c
index 1770ac7..1770ac7 100644
--- a/runit-2.1.1/src/pathexec_run.c
+++ b/runit-2.1.2/src/pathexec_run.c
diff --git a/runit-2.1.1/src/pmatch.c b/runit-2.1.2/src/pmatch.c
index 2fc9a53..2fc9a53 100644
--- a/runit-2.1.1/src/pmatch.c
+++ b/runit-2.1.2/src/pmatch.c
diff --git a/runit-2.1.1/src/pmatch.h b/runit-2.1.2/src/pmatch.h
index 8d4eb8b..8d4eb8b 100644
--- a/runit-2.1.1/src/pmatch.h
+++ b/runit-2.1.2/src/pmatch.h
diff --git a/runit-2.1.1/src/print-ar.sh b/runit-2.1.2/src/print-ar.sh
index 99bc116..99bc116 100644
--- a/runit-2.1.1/src/print-ar.sh
+++ b/runit-2.1.2/src/print-ar.sh
diff --git a/runit-2.1.1/src/print-cc.sh b/runit-2.1.2/src/print-cc.sh
index 31f4ed3..31f4ed3 100644
--- a/runit-2.1.1/src/print-cc.sh
+++ b/runit-2.1.2/src/print-cc.sh
diff --git a/runit-2.1.1/src/print-ld.sh b/runit-2.1.2/src/print-ld.sh
index 59489a8..59489a8 100644
--- a/runit-2.1.1/src/print-ld.sh
+++ b/runit-2.1.2/src/print-ld.sh
diff --git a/runit-2.1.1/src/prot.c b/runit-2.1.2/src/prot.c
index 79a88c5..79a88c5 100644
--- a/runit-2.1.1/src/prot.c
+++ b/runit-2.1.2/src/prot.c
diff --git a/runit-2.1.1/src/prot.h b/runit-2.1.2/src/prot.h
index 2e5cb81..2e5cb81 100644
--- a/runit-2.1.1/src/prot.h
+++ b/runit-2.1.2/src/prot.h
diff --git a/runit-2.1.1/src/readclose.c b/runit-2.1.2/src/readclose.c
index 9d83007..9d83007 100644
--- a/runit-2.1.1/src/readclose.c
+++ b/runit-2.1.2/src/readclose.c
diff --git a/runit-2.1.1/src/readclose.h b/runit-2.1.2/src/readclose.h
index bde9889..bde9889 100644
--- a/runit-2.1.1/src/readclose.h
+++ b/runit-2.1.2/src/readclose.h
diff --git a/runit-2.1.1/src/reboot_system.h1 b/runit-2.1.2/src/reboot_system.h1
index d4950c9..d4950c9 100644
--- a/runit-2.1.1/src/reboot_system.h1
+++ b/runit-2.1.2/src/reboot_system.h1
diff --git a/runit-2.1.1/src/reboot_system.h2 b/runit-2.1.2/src/reboot_system.h2
index b30d1e9..b30d1e9 100644
--- a/runit-2.1.1/src/reboot_system.h2
+++ b/runit-2.1.2/src/reboot_system.h2
diff --git a/runit-2.1.1/src/runit-init.c b/runit-2.1.2/src/runit-init.c
index f075d98..00dc3c9 100644
--- a/runit-2.1.1/src/runit-init.c
+++ b/runit-2.1.2/src/runit-init.c
@@ -67,7 +67,7 @@ int main (int argc, const char * const *argv, char * const *envp) {
     break;
   case '-':
     if ((*argv)[1] == 'V')
-      strerr_warn1("$Id$\n", 0);
+      strerr_warn1("$Id: f075d98bf7dd17c893021f9572cbb970cdad8dcf $\n", 0);
   default:
     usage();
   }
diff --git a/runit-2.1.1/src/runit-init.check b/runit-2.1.2/src/runit-init.check
index 088e833..088e833 100755
--- a/runit-2.1.1/src/runit-init.check
+++ b/runit-2.1.2/src/runit-init.check
diff --git a/runit-2.1.1/src/runit-init.dist b/runit-2.1.2/src/runit-init.dist
index cca0307..cca0307 100644
--- a/runit-2.1.1/src/runit-init.dist
+++ b/runit-2.1.2/src/runit-init.dist
diff --git a/runit-2.1.1/src/runit.c b/runit-2.1.2/src/runit.c
index 48620b3..48620b3 100644
--- a/runit-2.1.1/src/runit.c
+++ b/runit-2.1.2/src/runit.c
diff --git a/runit-2.1.1/src/runit.check b/runit-2.1.2/src/runit.check
index 87f02d3..87f02d3 100755
--- a/runit-2.1.1/src/runit.check
+++ b/runit-2.1.2/src/runit.check
diff --git a/runit-2.1.1/src/runit.dist b/runit-2.1.2/src/runit.dist
index 135c411..135c411 100644
--- a/runit-2.1.1/src/runit.dist
+++ b/runit-2.1.2/src/runit.dist
diff --git a/runit-2.1.1/src/runit.h b/runit-2.1.2/src/runit.h
index ba98386..ba98386 100644
--- a/runit-2.1.1/src/runit.h
+++ b/runit-2.1.2/src/runit.h
diff --git a/runit-2.1.1/src/runsv.c b/runit-2.1.2/src/runsv.c
index 0de2803..0de2803 100644
--- a/runit-2.1.1/src/runsv.c
+++ b/runit-2.1.2/src/runsv.c
diff --git a/runit-2.1.1/src/runsv.check b/runit-2.1.2/src/runsv.check
index edfd0c9..edfd0c9 100755
--- a/runit-2.1.1/src/runsv.check
+++ b/runit-2.1.2/src/runsv.check
diff --git a/runit-2.1.1/src/runsv.dist b/runit-2.1.2/src/runsv.dist
index d2b05b7..d2b05b7 100644
--- a/runit-2.1.1/src/runsv.dist
+++ b/runit-2.1.2/src/runsv.dist
diff --git a/runit-2.1.1/src/runsvchdir.c b/runit-2.1.2/src/runsvchdir.c
index fe7e987..fe7e987 100644
--- a/runit-2.1.1/src/runsvchdir.c
+++ b/runit-2.1.2/src/runsvchdir.c
diff --git a/runit-2.1.1/src/runsvchdir.check b/runit-2.1.2/src/runsvchdir.check
index a8de02b..a8de02b 100755
--- a/runit-2.1.1/src/runsvchdir.check
+++ b/runit-2.1.2/src/runsvchdir.check
diff --git a/runit-2.1.1/src/runsvchdir.dist b/runit-2.1.2/src/runsvchdir.dist
index 7664608..7664608 100644
--- a/runit-2.1.1/src/runsvchdir.dist
+++ b/runit-2.1.2/src/runsvchdir.dist
diff --git a/runit-2.1.1/src/runsvctrl.c b/runit-2.1.2/src/runsvctrl.c
index d8eb2c4..d8eb2c4 100644
--- a/runit-2.1.1/src/runsvctrl.c
+++ b/runit-2.1.2/src/runsvctrl.c
diff --git a/runit-2.1.1/src/runsvctrl.check b/runit-2.1.2/src/runsvctrl.check
index 7911074..7911074 100755
--- a/runit-2.1.1/src/runsvctrl.check
+++ b/runit-2.1.2/src/runsvctrl.check
diff --git a/runit-2.1.1/src/runsvctrl.dist b/runit-2.1.2/src/runsvctrl.dist
index b07cf8a..b07cf8a 100644
--- a/runit-2.1.1/src/runsvctrl.dist
+++ b/runit-2.1.2/src/runsvctrl.dist
diff --git a/runit-2.1.1/src/runsvdir.c b/runit-2.1.2/src/runsvdir.c
index 07c1d8e..07c1d8e 100644
--- a/runit-2.1.1/src/runsvdir.c
+++ b/runit-2.1.2/src/runsvdir.c
diff --git a/runit-2.1.1/src/runsvdir.check b/runit-2.1.2/src/runsvdir.check
index a7927eb..a7927eb 100755
--- a/runit-2.1.1/src/runsvdir.check
+++ b/runit-2.1.2/src/runsvdir.check
diff --git a/runit-2.1.1/src/runsvdir.dist b/runit-2.1.2/src/runsvdir.dist
index c553363..c553363 100644
--- a/runit-2.1.1/src/runsvdir.dist
+++ b/runit-2.1.2/src/runsvdir.dist
diff --git a/runit-2.1.1/src/runsvstat.c b/runit-2.1.2/src/runsvstat.c
index c0c0233..c0c0233 100644
--- a/runit-2.1.1/src/runsvstat.c
+++ b/runit-2.1.2/src/runsvstat.c
diff --git a/runit-2.1.1/src/runsvstat.check b/runit-2.1.2/src/runsvstat.check
index 6ccde11..6ccde11 100755
--- a/runit-2.1.1/src/runsvstat.check
+++ b/runit-2.1.2/src/runsvstat.check
diff --git a/runit-2.1.1/src/runsvstat.dist b/runit-2.1.2/src/runsvstat.dist
index 24b9ed4..24b9ed4 100644
--- a/runit-2.1.1/src/runsvstat.dist
+++ b/runit-2.1.2/src/runsvstat.dist
diff --git a/runit-2.1.1/src/scan.h b/runit-2.1.2/src/scan.h
index 3db49d3..3db49d3 100644
--- a/runit-2.1.1/src/scan.h
+++ b/runit-2.1.2/src/scan.h
diff --git a/runit-2.1.1/src/scan_ulong.c b/runit-2.1.2/src/scan_ulong.c
index af19701..af19701 100644
--- a/runit-2.1.1/src/scan_ulong.c
+++ b/runit-2.1.2/src/scan_ulong.c
diff --git a/runit-2.1.1/src/seek.h b/runit-2.1.2/src/seek.h
index 8011701..8011701 100644
--- a/runit-2.1.1/src/seek.h
+++ b/runit-2.1.2/src/seek.h
diff --git a/runit-2.1.1/src/seek_set.c b/runit-2.1.2/src/seek_set.c
index 19b8265..19b8265 100644
--- a/runit-2.1.1/src/seek_set.c
+++ b/runit-2.1.2/src/seek_set.c
diff --git a/runit-2.1.1/src/select.h1 b/runit-2.1.2/src/select.h1
index 68e971f..68e971f 100644
--- a/runit-2.1.1/src/select.h1
+++ b/runit-2.1.2/src/select.h1
diff --git a/runit-2.1.1/src/select.h2 b/runit-2.1.2/src/select.h2
index 4bd4fcf..4bd4fcf 100644
--- a/runit-2.1.1/src/select.h2
+++ b/runit-2.1.2/src/select.h2
diff --git a/runit-2.1.1/src/sgetopt.c b/runit-2.1.2/src/sgetopt.c
index 8bb608f..8bb608f 100644
--- a/runit-2.1.1/src/sgetopt.c
+++ b/runit-2.1.2/src/sgetopt.c
diff --git a/runit-2.1.1/src/sgetopt.h b/runit-2.1.2/src/sgetopt.h
index bf8bce6..bf8bce6 100644
--- a/runit-2.1.1/src/sgetopt.h
+++ b/runit-2.1.2/src/sgetopt.h
diff --git a/runit-2.1.1/src/sig.c b/runit-2.1.2/src/sig.c
index 423d18e..423d18e 100644
--- a/runit-2.1.1/src/sig.c
+++ b/runit-2.1.2/src/sig.c
diff --git a/runit-2.1.1/src/sig.h b/runit-2.1.2/src/sig.h
index 2a3c780..2a3c780 100644
--- a/runit-2.1.1/src/sig.h
+++ b/runit-2.1.2/src/sig.h
diff --git a/runit-2.1.1/src/sig_block.c b/runit-2.1.2/src/sig_block.c
index a46c860..a46c860 100644
--- a/runit-2.1.1/src/sig_block.c
+++ b/runit-2.1.2/src/sig_block.c
diff --git a/runit-2.1.1/src/sig_catch.c b/runit-2.1.2/src/sig_catch.c
index 7b5bd89..7b5bd89 100644
--- a/runit-2.1.1/src/sig_catch.c
+++ b/runit-2.1.2/src/sig_catch.c
diff --git a/runit-2.1.1/src/sig_pause.c b/runit-2.1.2/src/sig_pause.c
index 3d1a793..3d1a793 100644
--- a/runit-2.1.1/src/sig_pause.c
+++ b/runit-2.1.2/src/sig_pause.c
diff --git a/runit-2.1.1/src/str.h b/runit-2.1.2/src/str.h
index f65b8f6..f65b8f6 100644
--- a/runit-2.1.1/src/str.h
+++ b/runit-2.1.2/src/str.h
diff --git a/runit-2.1.1/src/str_chr.c b/runit-2.1.2/src/str_chr.c
index 9b467eb..9b467eb 100644
--- a/runit-2.1.1/src/str_chr.c
+++ b/runit-2.1.2/src/str_chr.c
diff --git a/runit-2.1.1/src/str_diff.c b/runit-2.1.2/src/str_diff.c
index 47dff22..47dff22 100644
--- a/runit-2.1.1/src/str_diff.c
+++ b/runit-2.1.2/src/str_diff.c
diff --git a/runit-2.1.1/src/str_len.c b/runit-2.1.2/src/str_len.c
index dedd005..dedd005 100644
--- a/runit-2.1.1/src/str_len.c
+++ b/runit-2.1.2/src/str_len.c
diff --git a/runit-2.1.1/src/str_start.c b/runit-2.1.2/src/str_start.c
index 017efc7..017efc7 100644
--- a/runit-2.1.1/src/str_start.c
+++ b/runit-2.1.2/src/str_start.c
diff --git a/runit-2.1.1/src/stralloc.h b/runit-2.1.2/src/stralloc.h
index 51d61bd..51d61bd 100644
--- a/runit-2.1.1/src/stralloc.h
+++ b/runit-2.1.2/src/stralloc.h
diff --git a/runit-2.1.1/src/stralloc_cat.c b/runit-2.1.2/src/stralloc_cat.c
index 2c6ad58..2c6ad58 100644
--- a/runit-2.1.1/src/stralloc_cat.c
+++ b/runit-2.1.2/src/stralloc_cat.c
diff --git a/runit-2.1.1/src/stralloc_catb.c b/runit-2.1.2/src/stralloc_catb.c
index 8ee0af4..8ee0af4 100644
--- a/runit-2.1.1/src/stralloc_catb.c
+++ b/runit-2.1.2/src/stralloc_catb.c
diff --git a/runit-2.1.1/src/stralloc_cats.c b/runit-2.1.2/src/stralloc_cats.c
index ea1e290..ea1e290 100644
--- a/runit-2.1.1/src/stralloc_cats.c
+++ b/runit-2.1.2/src/stralloc_cats.c
diff --git a/runit-2.1.1/src/stralloc_eady.c b/runit-2.1.2/src/stralloc_eady.c
index 81dbb85..81dbb85 100644
--- a/runit-2.1.1/src/stralloc_eady.c
+++ b/runit-2.1.2/src/stralloc_eady.c
diff --git a/runit-2.1.1/src/stralloc_opyb.c b/runit-2.1.2/src/stralloc_opyb.c
index bbcff48..bbcff48 100644
--- a/runit-2.1.1/src/stralloc_opyb.c
+++ b/runit-2.1.2/src/stralloc_opyb.c
diff --git a/runit-2.1.1/src/stralloc_opys.c b/runit-2.1.2/src/stralloc_opys.c
index 075b6f8..075b6f8 100644
--- a/runit-2.1.1/src/stralloc_opys.c
+++ b/runit-2.1.2/src/stralloc_opys.c
diff --git a/runit-2.1.1/src/stralloc_pend.c b/runit-2.1.2/src/stralloc_pend.c
index 70cb55c..70cb55c 100644
--- a/runit-2.1.1/src/stralloc_pend.c
+++ b/runit-2.1.2/src/stralloc_pend.c
diff --git a/runit-2.1.1/src/strerr.h b/runit-2.1.2/src/strerr.h
index 21d812d..21d812d 100644
--- a/runit-2.1.1/src/strerr.h
+++ b/runit-2.1.2/src/strerr.h
diff --git a/runit-2.1.1/src/strerr_die.c b/runit-2.1.2/src/strerr_die.c
index f226b80..f226b80 100644
--- a/runit-2.1.1/src/strerr_die.c
+++ b/runit-2.1.2/src/strerr_die.c
diff --git a/runit-2.1.1/src/strerr_sys.c b/runit-2.1.2/src/strerr_sys.c
index 84b302f..84b302f 100644
--- a/runit-2.1.1/src/strerr_sys.c
+++ b/runit-2.1.2/src/strerr_sys.c
diff --git a/runit-2.1.1/src/subgetopt.c b/runit-2.1.2/src/subgetopt.c
index 85ace96..85ace96 100644
--- a/runit-2.1.1/src/subgetopt.c
+++ b/runit-2.1.2/src/subgetopt.c
diff --git a/runit-2.1.1/src/subgetopt.h b/runit-2.1.2/src/subgetopt.h
index 41ad26a..41ad26a 100644
--- a/runit-2.1.1/src/subgetopt.h
+++ b/runit-2.1.2/src/subgetopt.h
diff --git a/runit-2.1.1/src/sv.c b/runit-2.1.2/src/sv.c
index e27ccb2..0125795 100644
--- a/runit-2.1.1/src/sv.c
+++ b/runit-2.1.2/src/sv.c
@@ -17,7 +17,7 @@
 #define USAGE " [-v] [-w sec] command service ..."
 #define USAGELSB " [-w sec] command"
 
-#define VERSION "$Id: d126cee39d1887d523c122ffb033d1ea098c9f24 $"
+#define VERSION "$Id: 900314260c6d52c986c5357673bea2f3bd3f4698 $"
 
 #define FATAL   "fatal: "
 #define FAIL    "fail: "
@@ -41,6 +41,7 @@ unsigned int lsb;
 unsigned int verbose =0;
 unsigned long wait =7;
 unsigned int kll =0;
+unsigned int islog =0;
 struct taia tstart, tnow, tdiff;
 struct tai tstatus;
 
@@ -67,6 +68,7 @@ void fatal2(char *m1, char *m2) {
 void out(char *p, char *m1) {
   buffer_puts(buffer_1, p);
   buffer_puts(buffer_1, *service);
+  if (islog) buffer_puts(buffer_1, "/log");
   buffer_puts(buffer_1, ": ");
   buffer_puts(buffer_1, m1);
   if (errno) {
@@ -153,20 +155,22 @@ int status(char *unused) {
   int rc;
 
   rc =svstatus_get();
-  switch(r) { case -1: if (lsb) done(4); case 0: return(0); }
+  switch(rc) { case -1: if (lsb) done(4); case 0: return(0); }
   rc =svstatus_print(*service);
+  islog =1;
   if (chdir("log") == -1) {
     if (errno != error_noent) {
-      outs("; log: "); outs(WARN);
-      outs("unable to change to log service directory: ");
-      outs(error_str(errno));
+      outs("; ");
+      warn("unable to change directory");
     }
+    else outs("\n");
   }
-  else
-    if (svstatus_get()) {
-      outs("; "); svstatus_print("log");
-    }
-  flush("\n");
+  else {
+    outs("; ");
+    if (svstatus_get()) { rc =svstatus_print("log"); outs("\n"); }
+  }
+  islog =0;
+  flush("");
   if (lsb) switch(rc) { case 1: done(0); case 2: done(3); case 0: done(4); }
   return(rc);
 }
@@ -305,9 +309,11 @@ int main(int argc, char **argv) {
     acts ="d"; kll =1; cbk =&check; break;
   case 'T':
     acts ="tc"; kll =1; cbk =&check; break;
+  case 't':
+    if (!str_diff(action, "try-restart")) { acts ="tc"; cbk =&check; break; }
   case 'c':
     if (!str_diff(action, "check")) { act =0; acts ="C"; cbk =&check; break; }
-  case 'u': case 'd': case 'o': case 't': case 'p': case 'h':
+  case 'u': case 'd': case 'o': case 'p': case 'h':
   case 'a': case 'i': case 'k': case 'q': case '1': case '2':
     action[1] =0; acts =action; break;
   case 's':
@@ -318,6 +324,7 @@ int main(int argc, char **argv) {
     act =&status; cbk =0; break;
   case 'r':
     if (!str_diff(action, "restart")) { acts ="tcu"; cbk =&check; break; }
+    if (!str_diff(action, "reload")) { acts ="h"; cbk =&check; break; }
     usage();
   case 'f':
     if (!str_diff(action, "force-reload"))
diff --git a/runit-2.1.1/src/sv.check b/runit-2.1.2/src/sv.check
index d3c277c..d3c277c 100755
--- a/runit-2.1.1/src/sv.check
+++ b/runit-2.1.2/src/sv.check
diff --git a/runit-2.1.1/src/sv.dist b/runit-2.1.2/src/sv.dist
index 98290f2..5b6c3ee 100644
--- a/runit-2.1.1/src/sv.dist
+++ b/runit-2.1.2/src/sv.dist
@@ -1,7 +1,7 @@
 usage: sv [-v] [-w sec] command service ...
 
 100
-$Id: d126cee39d1887d523c122ffb033d1ea098c9f24 $
+$Id: 900314260c6d52c986c5357673bea2f3bd3f4698 $
 usage: sv [-v] [-w sec] command service ...
 
 100
diff --git a/runit-2.1.1/src/svlogd.c b/runit-2.1.2/src/svlogd.c
index 90a3321..90a3321 100644
--- a/runit-2.1.1/src/svlogd.c
+++ b/runit-2.1.2/src/svlogd.c
diff --git a/runit-2.1.1/src/svlogd.check b/runit-2.1.2/src/svlogd.check
index 7d926ef..7d926ef 100755
--- a/runit-2.1.1/src/svlogd.check
+++ b/runit-2.1.2/src/svlogd.check
diff --git a/runit-2.1.1/src/svlogd.dist b/runit-2.1.2/src/svlogd.dist
index b3329e6..b3329e6 100644
--- a/runit-2.1.1/src/svlogd.dist
+++ b/runit-2.1.2/src/svlogd.dist
diff --git a/runit-2.1.1/src/svwaitdown.c b/runit-2.1.2/src/svwaitdown.c
index 21a2c2c..21a2c2c 100644
--- a/runit-2.1.1/src/svwaitdown.c
+++ b/runit-2.1.2/src/svwaitdown.c
diff --git a/runit-2.1.1/src/svwaitdown.check b/runit-2.1.2/src/svwaitdown.check
index 5cf6c21..5cf6c21 100755
--- a/runit-2.1.1/src/svwaitdown.check
+++ b/runit-2.1.2/src/svwaitdown.check
diff --git a/runit-2.1.1/src/svwaitdown.dist b/runit-2.1.2/src/svwaitdown.dist
index 2d83839..2d83839 100644
--- a/runit-2.1.1/src/svwaitdown.dist
+++ b/runit-2.1.2/src/svwaitdown.dist
diff --git a/runit-2.1.1/src/svwaitup.c b/runit-2.1.2/src/svwaitup.c
index e682bbe..e682bbe 100644
--- a/runit-2.1.1/src/svwaitup.c
+++ b/runit-2.1.2/src/svwaitup.c
diff --git a/runit-2.1.1/src/svwaitup.check b/runit-2.1.2/src/svwaitup.check
index a1be802..a1be802 100755
--- a/runit-2.1.1/src/svwaitup.check
+++ b/runit-2.1.2/src/svwaitup.check
diff --git a/runit-2.1.1/src/svwaitup.dist b/runit-2.1.2/src/svwaitup.dist
index 692990f..692990f 100644
--- a/runit-2.1.1/src/svwaitup.dist
+++ b/runit-2.1.2/src/svwaitup.dist
diff --git a/runit-2.1.1/src/tai.h b/runit-2.1.2/src/tai.h
index 1839f76..1839f76 100644
--- a/runit-2.1.1/src/tai.h
+++ b/runit-2.1.2/src/tai.h
diff --git a/runit-2.1.1/src/tai_now.c b/runit-2.1.2/src/tai_now.c
index 217ba75..217ba75 100644
--- a/runit-2.1.1/src/tai_now.c
+++ b/runit-2.1.2/src/tai_now.c
diff --git a/runit-2.1.1/src/tai_pack.c b/runit-2.1.2/src/tai_pack.c
index 641fa5b..641fa5b 100644
--- a/runit-2.1.1/src/tai_pack.c
+++ b/runit-2.1.2/src/tai_pack.c
diff --git a/runit-2.1.1/src/tai_sub.c b/runit-2.1.2/src/tai_sub.c
index e891600..e891600 100644
--- a/runit-2.1.1/src/tai_sub.c
+++ b/runit-2.1.2/src/tai_sub.c
diff --git a/runit-2.1.1/src/tai_unpack.c b/runit-2.1.2/src/tai_unpack.c
index 4541ff5..4541ff5 100644
--- a/runit-2.1.1/src/tai_unpack.c
+++ b/runit-2.1.2/src/tai_unpack.c
diff --git a/runit-2.1.1/src/taia.h b/runit-2.1.2/src/taia.h
index 3882d1d..3882d1d 100644
--- a/runit-2.1.1/src/taia.h
+++ b/runit-2.1.2/src/taia.h
diff --git a/runit-2.1.1/src/taia_add.c b/runit-2.1.2/src/taia_add.c
index 0ac8e6b..0ac8e6b 100644
--- a/runit-2.1.1/src/taia_add.c
+++ b/runit-2.1.2/src/taia_add.c
diff --git a/runit-2.1.1/src/taia_approx.c b/runit-2.1.2/src/taia_approx.c
index c6f5f27..c6f5f27 100644
--- a/runit-2.1.1/src/taia_approx.c
+++ b/runit-2.1.2/src/taia_approx.c
diff --git a/runit-2.1.1/src/taia_frac.c b/runit-2.1.2/src/taia_frac.c
index f709f3e..f709f3e 100644
--- a/runit-2.1.1/src/taia_frac.c
+++ b/runit-2.1.2/src/taia_frac.c
diff --git a/runit-2.1.1/src/taia_less.c b/runit-2.1.2/src/taia_less.c
index 18a9378..18a9378 100644
--- a/runit-2.1.1/src/taia_less.c
+++ b/runit-2.1.2/src/taia_less.c
diff --git a/runit-2.1.1/src/taia_now.c b/runit-2.1.2/src/taia_now.c
index 3a951a9..3a951a9 100644
--- a/runit-2.1.1/src/taia_now.c
+++ b/runit-2.1.2/src/taia_now.c
diff --git a/runit-2.1.1/src/taia_pack.c b/runit-2.1.2/src/taia_pack.c
index 9047da1..9047da1 100644
--- a/runit-2.1.1/src/taia_pack.c
+++ b/runit-2.1.2/src/taia_pack.c
diff --git a/runit-2.1.1/src/taia_sub.c b/runit-2.1.2/src/taia_sub.c
index d902e50..d902e50 100644
--- a/runit-2.1.1/src/taia_sub.c
+++ b/runit-2.1.2/src/taia_sub.c
diff --git a/runit-2.1.1/src/taia_uint.c b/runit-2.1.2/src/taia_uint.c
index 8b7f2d4..8b7f2d4 100644
--- a/runit-2.1.1/src/taia_uint.c
+++ b/runit-2.1.2/src/taia_uint.c
diff --git a/runit-2.1.1/src/trycpp.c b/runit-2.1.2/src/trycpp.c
index e4503d4..e4503d4 100644
--- a/runit-2.1.1/src/trycpp.c
+++ b/runit-2.1.2/src/trycpp.c
diff --git a/runit-2.1.1/src/trydrent.c b/runit-2.1.2/src/trydrent.c
index 3333ac0..3333ac0 100644
--- a/runit-2.1.1/src/trydrent.c
+++ b/runit-2.1.2/src/trydrent.c
diff --git a/runit-2.1.1/src/tryflock.c b/runit-2.1.2/src/tryflock.c
index a82ffc2..a82ffc2 100644
--- a/runit-2.1.1/src/tryflock.c
+++ b/runit-2.1.2/src/tryflock.c
diff --git a/runit-2.1.1/src/trymkffo.c b/runit-2.1.2/src/trymkffo.c
index 9356342..9356342 100644
--- a/runit-2.1.1/src/trymkffo.c
+++ b/runit-2.1.2/src/trymkffo.c
diff --git a/runit-2.1.1/src/trypoll.c b/runit-2.1.2/src/trypoll.c
index 6506617..6506617 100644
--- a/runit-2.1.1/src/trypoll.c
+++ b/runit-2.1.2/src/trypoll.c
diff --git a/runit-2.1.1/src/tryreboot.c b/runit-2.1.2/src/tryreboot.c
index aefc703..aefc703 100644
--- a/runit-2.1.1/src/tryreboot.c
+++ b/runit-2.1.2/src/tryreboot.c
diff --git a/runit-2.1.1/src/trysgact.c b/runit-2.1.2/src/trysgact.c
index e264ef2..e264ef2 100644
--- a/runit-2.1.1/src/trysgact.c
+++ b/runit-2.1.2/src/trysgact.c
diff --git a/runit-2.1.1/src/trysgprm.c b/runit-2.1.2/src/trysgprm.c
index a46c82c..a46c82c 100644
--- a/runit-2.1.1/src/trysgprm.c
+++ b/runit-2.1.2/src/trysgprm.c
diff --git a/runit-2.1.1/src/tryshsgr.c b/runit-2.1.2/src/tryshsgr.c
index c5ed6d6..c5ed6d6 100644
--- a/runit-2.1.1/src/tryshsgr.c
+++ b/runit-2.1.2/src/tryshsgr.c
diff --git a/runit-2.1.1/src/trysocketlib.c b/runit-2.1.2/src/trysocketlib.c
index 0fe5d06..0fe5d06 100644
--- a/runit-2.1.1/src/trysocketlib.c
+++ b/runit-2.1.2/src/trysocketlib.c
diff --git a/runit-2.1.1/src/trysysel.c b/runit-2.1.2/src/trysysel.c
index 5be862d..5be862d 100644
--- a/runit-2.1.1/src/trysysel.c
+++ b/runit-2.1.2/src/trysysel.c
diff --git a/runit-2.1.1/src/tryulong64.c b/runit-2.1.2/src/tryulong64.c
index 003548a..003548a 100644
--- a/runit-2.1.1/src/tryulong64.c
+++ b/runit-2.1.2/src/tryulong64.c
diff --git a/runit-2.1.1/src/tryuwtmp.c b/runit-2.1.2/src/tryuwtmp.c
index 2192a1e..2192a1e 100644
--- a/runit-2.1.1/src/tryuwtmp.c
+++ b/runit-2.1.2/src/tryuwtmp.c
diff --git a/runit-2.1.1/src/tryuwtmpx.c b/runit-2.1.2/src/tryuwtmpx.c
index d711c01..d711c01 100644
--- a/runit-2.1.1/src/tryuwtmpx.c
+++ b/runit-2.1.2/src/tryuwtmpx.c
diff --git a/runit-2.1.1/src/trywaitp.c b/runit-2.1.2/src/trywaitp.c
index 319b81f..319b81f 100644
--- a/runit-2.1.1/src/trywaitp.c
+++ b/runit-2.1.2/src/trywaitp.c
diff --git a/runit-2.1.1/src/uidgid.c b/runit-2.1.2/src/uidgid.c
index befa754..befa754 100644
--- a/runit-2.1.1/src/uidgid.c
+++ b/runit-2.1.2/src/uidgid.c
diff --git a/runit-2.1.1/src/uidgid.h b/runit-2.1.2/src/uidgid.h
index 13cacbc..13cacbc 100644
--- a/runit-2.1.1/src/uidgid.h
+++ b/runit-2.1.2/src/uidgid.h
diff --git a/runit-2.1.1/src/uint64.h1 b/runit-2.1.2/src/uint64.h1
index 486a380..486a380 100644
--- a/runit-2.1.1/src/uint64.h1
+++ b/runit-2.1.2/src/uint64.h1
diff --git a/runit-2.1.1/src/uint64.h2 b/runit-2.1.2/src/uint64.h2
index 8869e43..8869e43 100644
--- a/runit-2.1.1/src/uint64.h2
+++ b/runit-2.1.2/src/uint64.h2
diff --git a/runit-2.1.1/src/utmpset.c b/runit-2.1.2/src/utmpset.c
index eea41a5..eea41a5 100644
--- a/runit-2.1.1/src/utmpset.c
+++ b/runit-2.1.2/src/utmpset.c
diff --git a/runit-2.1.1/src/utmpset.check b/runit-2.1.2/src/utmpset.check
index 51cf1a4..51cf1a4 100755
--- a/runit-2.1.1/src/utmpset.check
+++ b/runit-2.1.2/src/utmpset.check
diff --git a/runit-2.1.1/src/utmpset.dist b/runit-2.1.2/src/utmpset.dist
index d5c0370..d5c0370 100644
--- a/runit-2.1.1/src/utmpset.dist
+++ b/runit-2.1.2/src/utmpset.dist
diff --git a/runit-2.1.1/src/uw_tmp.h1 b/runit-2.1.2/src/uw_tmp.h1
index 2d5e994..2d5e994 100644
--- a/runit-2.1.1/src/uw_tmp.h1
+++ b/runit-2.1.2/src/uw_tmp.h1
diff --git a/runit-2.1.1/src/uw_tmp.h2 b/runit-2.1.2/src/uw_tmp.h2
index ae9542e..ae9542e 100644
--- a/runit-2.1.1/src/uw_tmp.h2
+++ b/runit-2.1.2/src/uw_tmp.h2
diff --git a/runit-2.1.1/src/wait.h b/runit-2.1.2/src/wait.h
index d294e9d..d294e9d 100644
--- a/runit-2.1.1/src/wait.h
+++ b/runit-2.1.2/src/wait.h
diff --git a/runit-2.1.1/src/wait_nohang.c b/runit-2.1.2/src/wait_nohang.c
index 5c9c53d..5c9c53d 100644
--- a/runit-2.1.1/src/wait_nohang.c
+++ b/runit-2.1.2/src/wait_nohang.c
diff --git a/runit-2.1.1/src/wait_pid.c b/runit-2.1.2/src/wait_pid.c
index c2869b8..c2869b8 100644
--- a/runit-2.1.1/src/wait_pid.c
+++ b/runit-2.1.2/src/wait_pid.c
diff --git a/runit-2.1.1/src/warn-auto.sh b/runit-2.1.2/src/warn-auto.sh
index 36d2313..36d2313 100644
--- a/runit-2.1.1/src/warn-auto.sh
+++ b/runit-2.1.2/src/warn-auto.sh
diff --git a/runit-2.1.1/src/warn-shsgr b/runit-2.1.2/src/warn-shsgr
index 37c351e..37c351e 100644
--- a/runit-2.1.1/src/warn-shsgr
+++ b/runit-2.1.2/src/warn-shsgr
diff --git a/runit-2.1.1/src/x86cpuid.c b/runit-2.1.2/src/x86cpuid.c
index f81c593..f81c593 100644
--- a/runit-2.1.1/src/x86cpuid.c
+++ b/runit-2.1.2/src/x86cpuid.c