about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-07-20 20:33:59 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-07-20 20:33:59 +0000
commit6882b1e7632d6820f8b1e3840fcdcd23bfd968a5 (patch)
treea82c821a6a3f96128921217b1ff3f984e1bdaedd
parent36de1c29c48d35416d8819d32ee577c085ec05dd (diff)
downloads6-rc-6882b1e7632d6820f8b1e3840fcdcd23bfd968a5.tar.gz
s6-rc-6882b1e7632d6820f8b1e3840fcdcd23bfd968a5.tar.xz
s6-rc-6882b1e7632d6820f8b1e3840fcdcd23bfd968a5.zip
Bump dependencies, support for new s6-svc options
-rw-r--r--INSTALL4
-rw-r--r--doc/index.html4
-rw-r--r--src/s6-rc/s6-rc.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
index 148309a..c0a692f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 4.0 or later
-  - skalibs version 2.3.5.2 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.3.6.0 or later: http://skarnet.org/software/skalibs/
   - execline version 2.1.2.2 or later: http://skarnet.org/software/execline/
-  - s6 version 2.1.6.0 or later: http://skarnet.org/software/s6/
+  - s6 version 2.2.0.0 or later: http://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/doc/index.html b/doc/index.html
index e9a70b4..ab997dd 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -47,11 +47,11 @@ scripts are also run in a controlled environment.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 4.0 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.5.2 or later </li>
+2.3.6.0 or later </li>
  <li> <a href="http://skarnet.org/software/execline/">execline</a> version
 2.1.2.2 or later </li>
  <li> <a href="http://skarnet.org/software/s6/">s6</a> version
-2.1.6.0 or later </li>
+2.2.0.0 or later </li>
 </ul>
 
 <h3> Licensing </h3>
diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c
index 423a836..65673b3 100644
--- a/src/s6-rc/s6-rc.c
+++ b/src/s6-rc/s6-rc.c
@@ -140,7 +140,7 @@ static pid_t start_longrun (unsigned int i, int h)
     newargv[m++] = "--" ;
   }
   newargv[m++] = S6_EXTBINPREFIX "s6-svc" ;
-  newargv[m++] = h ? h == 2 ? "-u" : "-Uu" : "-Dd" ;
+  newargv[m++] = h ? h == 2 ? "-uwu" : "-uwU" : "-dwD" ;
   newargv[m++] = "-T" ;
   newargv[m++] = fmt ;
   newargv[m++] = "--" ;