From 6882b1e7632d6820f8b1e3840fcdcd23bfd968a5 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 20 Jul 2015 20:33:59 +0000 Subject: Bump dependencies, support for new s6-svc options --- INSTALL | 4 ++-- doc/index.html | 4 ++-- src/s6-rc/s6-rc.c | 2 +- 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.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 4.0 or later
  • skalibs version -2.3.5.2 or later
    • +2.3.6.0 or later
  • execline version 2.1.2.2 or later
  • s6 version -2.1.6.0 or later
    • +2.2.0.0 or later

    Licensing

    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++] = "--" ; -- cgit v1.2.3