Re: UPDATE: sysutils/runit 2.1.1 rc.d script (tagged: /service)
Ping. Discussion and diff below.
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
Manolis Tzanidakis mtzanida...@gmail.com writes:
Hey there,
On Thu (10/01/13), Jérémie Courrèges-Anglas wrote:
If runit going back to /service is a problem, I can provide a diff for
it to stay in /var/service.
I think it's better to stick with upstream's choice (/service) and avoid
maintaining an extra patch in the future.
IMHO what would be even better is a newer version of runit.
If /service is a no-no, I can handle the source and documentation
patches to make it stay in /var/service; I just need an answer.
No answer, so here's a diff for this proposal.
Building on Manolis Tzanidakis' work and changelog:
Changelog for the diff:
- Update to v2.1.1.
- Upstream changed service directory to /service from /var/service.
I made this configurable with SUBST_CMD, along with using full paths for
executables. I only patched the manpages, not the html documentation.
- Add rc.d(8) script.
This one used to install -d /service. I removed that and did not provide
/service - /var/service compat symlink. People may already have
a /service directory used by djbware.
- Remove files/rc.shutdown sample; functionality merged in rc.d script.
- Document upstream and port changes in pkg/MESSAGE.
The fact that the OpenBSD port will default to /var/service is
documented there.
- Remove USE_GROFF.
- Add license as comment.
I also added my patch to handle ctrl-alt-del, but it's a bit rough; I'm
not sure it's good enough for inclusion in the port. On the other hand,
I could add a *big* warning about replacing our /sbin/init not being
supported / handled by the port. :)
I'm also willing to take maintainership.
Done.
Thoughts?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/runit/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile11 Mar 2013 11:41:32 - 1.12
+++ Makefile22 Oct 2013 20:18:26 -
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/11 11:41:32 espie Exp $
+$OpenBSD: Makefile,v 1.12 2013/03/11 11:41:32 espie Exp $
COMMENT= daemontools alike replacement for init
-DISTNAME= runit-1.7.2
-REVISION= 0
+DISTNAME= runit-2.1.1
CATEGORIES=sysutils
HOMEPAGE= http://www.smarden.org/runit/
+MAINTAINER=Jeremie Courreges-Anglas j...@wxcvbn.org
+# BSD3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c
+WANTLIB= c
MASTER_SITES= ${HOMEPAGE}
WRKDIST= ${WRKDIR}/admin/${DISTNAME}
@@ -25,23 +26,27 @@ DOCS1= benefits.html chpst.8.html depe
upgrade.html useinit.html index.html utmpset.8.html
DOCS2= CHANGES README COPYING THANKS
EXAMPLES= etc/2 etc/openbsd/1 etc/openbsd/3 etc/openbsd/ctrlaltdel
-USE_GROFF =Yes
-pre-build:
+RUNIT_SERVICE_DIR= ${LOCALSTATEDIR}/service
+SUBST_FILES= etc/openbsd/3 man/runsv.8 man/runsvchdir.8 man/sv.8 \
+ man/utmpset.8 src/sv.c
+SUBST_VARS=RUNIT_SERVICE_DIR
+
+do-configure:
+ cd ${WRKDIST} ${SUBST_CMD} ${SUBST_FILES}
echo ${CC} ${CFLAGS} ${COPTS} ${WRKSRC}/conf-cc
echo ${CC} ${LDFLAGS} ${WRKSRC}/conf-ld
do-build:
- cd ${WRKDIST} package/compile
+ cd ${WRKDIST} ${SETENV} ${MAKE_ENV} package/compile
do-test:
- cd ${WRKDIST}/compile make check
+ cd ${WRKDIST}/compile ${SETENV} ${MAKE_ENV} make check
do-install:
.for pgm in ${SBINPROGRAMS}
${INSTALL_PROGRAM} ${WRKDIST}/command/${pgm} ${PREFIX}/sbin/
.endfor
- ${INSTALL_SCRIPT} ${WRKDIST}/etc/2 ${PREFIX}/sbin/runsvdir-start
.for page in ${MANPAGES}
${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man8
.endfor
@@ -53,7 +58,6 @@ do-install:
${INSTALL_DATA} ${WRKDIST}/package/${doc} ${PREFIX}/share/doc/runit/
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/runit
- ${INSTALL_DATA} ${FILESDIR}/rc.shutdown ${PREFIX}/share/examples/runit/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/runit/init
.for file in ${EXAMPLES}
${INSTALL_DATA} ${WRKDIST}/${file} ${PREFIX}/share/examples/runit/init/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/runit/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo5 Apr 2007 17:26:12 - 1.6
+++ distinfo22 Oct 2013 20:18:26 -
@@ -1,5 +1,2 @@
-MD5 (runit-1.7.2.tar.gz) = NUSOlxiFRJFPKYyIhxq5hA==
-RMD160 (runit-1.7.2.tar.gz) = szd8Nc3xrfUNMNxGo/Y8c9SDrkg=
-SHA1 (runit-1.7.2.tar.gz) = W40TUf6C/1xUcXkjXt4f2xkL6MM=
-SHA256 (runit-1.7.2.tar.gz) = zJEEH/jvsyN2Owc9VLpuvvZQKEu9GJPJrxmW/FaAnf4=
-SIZE (runit-1.7.2.tar.gz) = 102942
+SHA256
Re: UPDATE: sysutils/runit 2.1.1 rc.d script (tagged: /service)
Hi, any comments? Looking for ok's.
Re: UPDATE: sysutils/runit 2.1.1 rc.d script (tagged: /service)
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
Manolis Tzanidakis mtzanida...@gmail.com writes:
Hey there,
On Thu (10/01/13), Jérémie Courrèges-Anglas wrote:
If runit going back to /service is a problem, I can provide a diff for
it to stay in /var/service.
I think it's better to stick with upstream's choice (/service) and avoid
maintaining an extra patch in the future.
IMHO what would be even better is a newer version of runit.
If /service is a no-no, I can handle the source and documentation
patches to make it stay in /var/service; I just need an answer.
No answer, so here's a diff for this proposal.
Building on Manolis Tzanidakis' work and changelog:
Changelog for the diff:
- Update to v2.1.1.
- Upstream changed service directory to /service from /var/service.
I made this configurable with SUBST_CMD, along with using full paths for
executables. I only patched the manpages, not the html documentation.
- Add rc.d(8) script.
This one used to install -d /service. I removed that and did not provide
/service - /var/service compat symlink. People may already have
a /service directory used by djbware.
- Remove files/rc.shutdown sample; functionality merged in rc.d script.
- Document upstream and port changes in pkg/MESSAGE.
The fact that the OpenBSD port will default to /var/service is
documented there.
- Remove USE_GROFF.
- Add license as comment.
I also added my patch to handle ctrl-alt-del, but it's a bit rough; I'm
not sure it's good enough for inclusion in the port. On the other hand,
I could add a *big* warning about replacing our /sbin/init not being
supported / handled by the port. :)
I'm also willing to take maintainership.
Done.
Thoughts?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/runit/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile11 Mar 2013 11:41:32 - 1.12
+++ Makefile14 Jun 2013 10:02:55 -
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/11 11:41:32 espie Exp $
+$OpenBSD: Makefile,v 1.12 2013/03/11 11:41:32 espie Exp $
COMMENT= daemontools alike replacement for init
-DISTNAME= runit-1.7.2
-REVISION= 0
+DISTNAME= runit-2.1.1
CATEGORIES=sysutils
HOMEPAGE= http://www.smarden.org/runit/
+MAINTAINER=Jeremie Courreges-Anglas j...@wxcvbn.org
+# BSD3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c
+WANTLIB= c
MASTER_SITES= ${HOMEPAGE}
WRKDIST= ${WRKDIR}/admin/${DISTNAME}
@@ -25,23 +26,27 @@ DOCS1= benefits.html chpst.8.html depe
upgrade.html useinit.html index.html utmpset.8.html
DOCS2= CHANGES README COPYING THANKS
EXAMPLES= etc/2 etc/openbsd/1 etc/openbsd/3 etc/openbsd/ctrlaltdel
-USE_GROFF =Yes
-pre-build:
+RUNIT_SERVICE_DIR= ${LOCALSTATEDIR}/service
+SUBST_FILES= etc/openbsd/3 man/runsv.8 man/runsvchdir.8 man/sv.8 \
+ man/utmpset.8 src/sv.c
+SUBST_VARS=RUNIT_SERVICE_DIR
+
+do-configure:
+ cd ${WRKDIST} ${SUBST_CMD} ${SUBST_FILES}
echo ${CC} ${CFLAGS} ${COPTS} ${WRKSRC}/conf-cc
echo ${CC} ${LDFLAGS} ${WRKSRC}/conf-ld
do-build:
- cd ${WRKDIST} package/compile
+ cd ${WRKDIST} ${SETENV} ${MAKE_ENV} package/compile
do-test:
- cd ${WRKDIST}/compile make check
+ cd ${WRKDIST}/compile ${SETENV} ${MAKE_ENV} make check
do-install:
.for pgm in ${SBINPROGRAMS}
${INSTALL_PROGRAM} ${WRKDIST}/command/${pgm} ${PREFIX}/sbin/
.endfor
- ${INSTALL_SCRIPT} ${WRKDIST}/etc/2 ${PREFIX}/sbin/runsvdir-start
.for page in ${MANPAGES}
${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man8
.endfor
@@ -53,7 +58,6 @@ do-install:
${INSTALL_DATA} ${WRKDIST}/package/${doc} ${PREFIX}/share/doc/runit/
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/runit
- ${INSTALL_DATA} ${FILESDIR}/rc.shutdown ${PREFIX}/share/examples/runit/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/runit/init
.for file in ${EXAMPLES}
${INSTALL_DATA} ${WRKDIST}/${file} ${PREFIX}/share/examples/runit/init/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/runit/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo5 Apr 2007 17:26:12 - 1.6
+++ distinfo10 Jun 2013 22:10:18 -
@@ -1,5 +1,2 @@
-MD5 (runit-1.7.2.tar.gz) = NUSOlxiFRJFPKYyIhxq5hA==
-RMD160 (runit-1.7.2.tar.gz) = szd8Nc3xrfUNMNxGo/Y8c9SDrkg=
-SHA1 (runit-1.7.2.tar.gz) = W40TUf6C/1xUcXkjXt4f2xkL6MM=
-SHA256 (runit-1.7.2.tar.gz) = zJEEH/jvsyN2Owc9VLpuvvZQKEu9GJPJrxmW/FaAnf4=
-SIZE (runit-1.7.2.tar.gz) = 102942
+SHA256 (runit-2.1.1.tar.gz) = /88tJ7MvWawU8tSwdyo+uA2TQmhaIEK3+7xHLAfPKiw=
+SIZE (runit-2.1.1.tar.gz) = 109661
Re: UPDATE: sysutils/runit 2.1.1 rc.d script (tagged: /service)
Manolis Tzanidakis mtzanida...@gmail.com writes: Hey there, On Thu (10/01/13), Jérémie Courrèges-Anglas wrote: If runit going back to /service is a problem, I can provide a diff for it to stay in /var/service. I think it's better to stick with upstream's choice (/service) and avoid maintaining an extra patch in the future. IMHO what would be even better is a newer version of runit. If /service is a no-no, I can handle the source and documentation patches to make it stay in /var/service; I just need an answer. I'm also willing to take maintainership. -- Jérémie Courrèges-Anglas PGP Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: UPDATE: sysutils/runit 2.1.1 rc.d script
If runit going back to /service is a problem, I can provide a diff for it to stay in /var/service. -- Jérémie Courrèges-Anglas GPG Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: UPDATE: sysutils/runit 2.1.1 rc.d script
Hey there, On Thu (10/01/13), Jérémie Courrèges-Anglas wrote: If runit going back to /service is a problem, I can provide a diff for it to stay in /var/service. I think it's better to stick with upstream's choice (/service) and avoid maintaining an extra patch in the future. -- Manolis Tzanidakis http://mtzanidakis.com/ mtzanidakis[at]gmail[dot]com
Re: UPDATE: sysutils/runit 2.1.1 rc.d script
Hi,
runsvdir and runit-init work fine so far on i386 (-current), even if
I find it weird that upstream goes back to /service - I just symlinked
/service to /var/service, the ''install -d /service'' step in rc_pre()
does respect that.
etc/openbsd/3 would obviously need patching to work properly out of the
box (it calls sv(8) while this one isn't in PATH); perl -pie can help
but caring about this could be interpreted as remplacing init with
runit is supported, so... :)
Attached is a lightly tested patch to handle ctrlaltdel. The OpenBSD
kernel sends pid 1 SIGUSR1, not SIGINT, the patch basically makes runit
consider both as equivalent; that is different from the way our init
handles them but that's good enough at least for my use case. It would
of course need more tweaking before being sent upstream.
--
Jérémie Courrèges-Anglas
GPG Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
diff -pruN /usr/ports/sysutils/runit/patches/patch-src_runit_c /usr/ports/mystuff/sysutils/runit/patches/patch-src_runit_c
--- /usr/ports/sysutils/runit/patches/patch-src_runit_c Thu Jan 1 01:00:00 1970
+++ /usr/ports/mystuff/sysutils/runit/patches/patch-src_runit_c Mon Dec 10 04:03:46 2012
@@ -0,0 +1,38 @@
+$OpenBSD$
+Add SIGUSR1 support.
+--- src/runit.c.orig Sun Dec 9 19:35:19 2012
src/runit.c Sun Dec 9 19:38:42 2012
+@@ -66,6 +66,8 @@ int main (int argc, const char * const *argv, char * c
+ sig_block(sig_hangup);
+ sig_block(sig_int);
+ sig_catch(sig_int, sig_int_handler);
++ sig_block(sig_usr1);
++ sig_catch(sig_usr1, sig_int_handler);
+ sig_block(sig_pipe);
+ sig_block(sig_term);
+
+@@ -129,6 +131,8 @@ int main (int argc, const char * const *argv, char * c
+ sig_unblock(sig_hangup);
+ sig_unblock(sig_int);
+ sig_uncatch(sig_int);
++ sig_unblock(sig_usr1);
++ sig_uncatch(sig_usr1);
+ sig_unblock(sig_pipe);
+ sig_unblock(sig_term);
+
+@@ -145,6 +149,7 @@ int main (int argc, const char * const *argv, char * c
+ sig_unblock(sig_child);
+ sig_unblock(sig_cont);
+ sig_unblock(sig_int);
++ sig_unblock(sig_usr1);
+ #ifdef IOPAUSE_POLL
+ poll(x, 1, 14000);
+ #else
+@@ -156,6 +161,7 @@ int main (int argc, const char * const *argv, char * c
+ sig_block(sig_cont);
+ sig_block(sig_child);
+ sig_block(sig_int);
++ sig_block(sig_usr1);
+
+ while (read(selfpipe[0], ch, 1) == 1) {}
+ while ((child =wait_nohang(wstat)) 0)
diff -pruN /usr/ports/sysutils/runit/patches/patch-src_sig_c /usr/ports/mystuff/sysutils/runit/patches/patch-src_sig_c
--- /usr/ports/sysutils/runit/patches/patch-src_sig_c Thu Jan 1 01:00:00 1970
+++ /usr/ports/mystuff/sysutils/runit/patches/patch-src_sig_c Mon Dec 10 04:03:58 2012
@@ -0,0 +1,12 @@
+$OpenBSD$
+Add SIGUSR1 support.
+--- src/sig.c.orig Sun Oct 4 22:44:02 2009
src/sig.c Sun Dec 9 19:31:42 2012
+@@ -10,6 +10,7 @@ int sig_hangup = SIGHUP;
+ int sig_int = SIGINT;
+ int sig_pipe = SIGPIPE;
+ int sig_term = SIGTERM;
++int sig_usr1 = SIGUSR1;
+
+ void (*sig_defaulthandler)() = SIG_DFL;
+ void (*sig_ignorehandler)() = SIG_IGN;
diff -pruN /usr/ports/sysutils/runit/patches/patch-src_sig_h /usr/ports/mystuff/sysutils/runit/patches/patch-src_sig_h
--- /usr/ports/sysutils/runit/patches/patch-src_sig_h Thu Jan 1 01:00:00 1970
+++ /usr/ports/mystuff/sysutils/runit/patches/patch-src_sig_h Mon Dec 10 04:04:04 2012
@@ -0,0 +1,12 @@
+$OpenBSD$
+Add SIGUSR1 support.
+--- src/sig.h.orig Sun Dec 9 19:48:13 2012
src/sig.h Sun Dec 9 19:48:04 2012
+@@ -10,6 +10,7 @@ extern int sig_hangup;
+ extern int sig_int;
+ extern int sig_pipe;
+ extern int sig_term;
++extern int sig_usr1;
+
+ extern void (*sig_defaulthandler)();
+ extern void (*sig_ignorehandler)();
UPDATE: sysutils/runit 2.1.1 rc.d script
Hello all,
update for sysutils/runit to v2.1.1. Tested on i386, 5.2-RELEASE and
-current.
Changelog for the diff:
- Update to v2.1.1.
- Upstream changed service directory to /service from /var/service.
- Add rc.d(8) script.
- Remove files/rc.shutdown sample; functionality merged in rc.d script.
- Document upstream and port changes in pkg/MESSAGE.
- Remove USE_GROFF.
- Add license as comment.
diff -Naur /usr/ports/sysutils/runit/Makefile
/usr/ports/mystuff/sysutils/runit/Makefile
--- /usr/ports/sysutils/runit/Makefile Mon Nov 29 23:11:46 2010
+++ /usr/ports/mystuff/sysutils/runit/Makefile Sat Nov 24 18:34:18 2012
@@ -2,16 +2,16 @@
COMMENT= daemontools alike replacement for init
-DISTNAME= runit-1.7.2
-REVISION= 0
+DISTNAME= runit-2.1.1
CATEGORIES=sysutils
-
HOMEPAGE= http://www.smarden.org/runit/
+# BSD3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= c
MASTER_SITES= ${HOMEPAGE}
@@ -28,7 +28,6 @@
upgrade.html useinit.html index.html utmpset.8.html
DOCS2= CHANGES README COPYING THANKS
EXAMPLES= etc/2 etc/openbsd/1 etc/openbsd/3 etc/openbsd/ctrlaltdel
-USE_GROFF =Yes
pre-build:
echo ${CC} ${CFLAGS} ${COPTS} ${WRKSRC}/conf-cc
@@ -44,7 +43,6 @@
.for pgm in ${SBINPROGRAMS}
${INSTALL_PROGRAM} ${WRKDIST}/command/${pgm} ${PREFIX}/sbin/
.endfor
- ${INSTALL_SCRIPT} ${WRKDIST}/etc/2 ${PREFIX}/sbin/runsvdir-start
.for page in ${MANPAGES}
${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man8
.endfor
@@ -56,7 +54,6 @@
${INSTALL_DATA} ${WRKDIST}/package/${doc} ${PREFIX}/share/doc/runit/
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/runit
- ${INSTALL_DATA} ${FILESDIR}/rc.shutdown ${PREFIX}/share/examples/runit/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/runit/init
.for file in ${EXAMPLES}
${INSTALL_DATA} ${WRKDIST}/${file} ${PREFIX}/share/examples/runit/init/
diff -Naur /usr/ports/sysutils/runit/distinfo
/usr/ports/mystuff/sysutils/runit/distinfo
--- /usr/ports/sysutils/runit/distinfo Thu Apr 5 20:26:12 2007
+++ /usr/ports/mystuff/sysutils/runit/distinfo Sat Nov 24 18:21:10 2012
@@ -1,5 +1,2 @@
-MD5 (runit-1.7.2.tar.gz) = NUSOlxiFRJFPKYyIhxq5hA==
-RMD160 (runit-1.7.2.tar.gz) = szd8Nc3xrfUNMNxGo/Y8c9SDrkg=
-SHA1 (runit-1.7.2.tar.gz) = W40TUf6C/1xUcXkjXt4f2xkL6MM=
-SHA256 (runit-1.7.2.tar.gz) = zJEEH/jvsyN2Owc9VLpuvvZQKEu9GJPJrxmW/FaAnf4=
-SIZE (runit-1.7.2.tar.gz) = 102942
+SHA256 (runit-2.1.1.tar.gz) = /88tJ7MvWawU8tSwdyo+uA2TQmhaIEK3+7xHLAfPKiw=
+SIZE (runit-2.1.1.tar.gz) = 109661
diff -Naur /usr/ports/sysutils/runit/files/rc.shutdown
/usr/ports/mystuff/sysutils/runit/files/rc.shutdown
--- /usr/ports/sysutils/runit/files/rc.shutdown Tue Dec 26 17:04:54 2006
+++ /usr/ports/mystuff/sysutils/runit/files/rc.shutdown Thu Jan 1 02:00:00 1970
@@ -1,6 +0,0 @@
-# Stop runit services
-
-echo -n 'Waiting for services to stop...'
-/usr/local/sbin/sv -w196 force-stop /var/service/*
-/usr/local/sbin/sv exit /var/service/*
-
diff -Naur /usr/ports/sysutils/runit/pkg/MESSAGE
/usr/ports/mystuff/sysutils/runit/pkg/MESSAGE
--- /usr/ports/sysutils/runit/pkg/MESSAGE Tue Dec 26 17:04:55 2006
+++ /usr/ports/mystuff/sysutils/runit/pkg/MESSAGE Sat Nov 24 18:30:36 2012
@@ -1,10 +1,7 @@
-You will need to add
+With this version, this port uses rc.d(8). To start it on boot add
+'runsvdir' to pkg_scripts.
- csh -cf '${PREFIX}/sbin/runsvdir-start '
-
-to /etc/rc.local in order to have runit start at boot.
-
-The service directory has moved from /service to /var/service.
+The service directory has moved back to /service from /var/service.
With this version the runsvctrl, runsvstat, svwaitdown, and svwaitup
programs no longer are being installed. The functionality of these
diff -Naur /usr/ports/sysutils/runit/pkg/PLIST
/usr/ports/mystuff/sysutils/runit/pkg/PLIST
--- /usr/ports/sysutils/runit/pkg/PLIST Tue Dec 26 17:04:55 2006
+++ /usr/ports/mystuff/sysutils/runit/pkg/PLIST Sat Nov 24 18:21:32 2012
@@ -8,16 +8,15 @@
@man man/man8/sv.8
@man man/man8/svlogd.8
@man man/man8/utmpset.8
-sbin/chpst
-sbin/runit
-sbin/runit-init
-sbin/runsv
-sbin/runsvchdir
-sbin/runsvdir
-sbin/runsvdir-start
-sbin/sv
-sbin/svlogd
-sbin/utmpset
+@bin sbin/chpst
+@bin sbin/runit
+@bin sbin/runit-init
+@bin sbin/runsv
+@bin sbin/runsvchdir
+@bin sbin/runsvdir
+@bin sbin/sv
+@bin sbin/svlogd
+@bin sbin/utmpset
share/doc/runit/
share/doc/runit/CHANGES
share/doc/runit/COPYING
@@ -51,4 +50,5 @@
share/examples/runit/init/getty-ttyC4/
share/examples/runit/init/getty-ttyC4/finish
share/examples/runit/init/getty-ttyC4/run
-share/examples/runit/rc.shutdown
+@rcscript ${RCDIR}/runsvdir
+@sample /var/service/
diff -Naur /usr/ports/sysutils/runit/pkg/runsvdir.rc
Re: UPDATE: sysutils/runit
Am Samstag, den 09.12.2006, 11:49 +0100 schrieb Toni Mueller:
Hi,
On Fri, 08.12.2006 at 15:24:56 +0100, Christian Rueger [EMAIL PROTECTED]
wrote:
remove files/runsvdir-start, is not need any more
please don't. I find it still the easiest way to keep cruft out of
/etc/rc.local.
i don't want remove /usr/local/sbin/runsvdir-start, but your patch
install runsvdir-start from ${WRKDIST}/etc/2 so the files/runsvdir-start
from the ports-tree (!) is not need any more
@@ -49,7 +44,7 @@
.for pgm in ${SBINPROGRAMS}
${INSTALL_PROGRAM} ${WRKDIST}/command/${pgm} ${PREFIX}/sbin/
.endfor
- ${INSTALL_SCRIPT} files/runsvdir-start ${PREFIX}/sbin/
+ ${INSTALL_SCRIPT} ${WRKDIST}/etc/2
${PREFIX}/sbin/runsvdir-start
.for page in ${MANPAGES}
${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man8
.endfor
--
[ christian rueger ]
[ [EMAIL PROTECTED] ]
[ cr.rueger-net.de ]
Re: UPDATE: sysutils/runit
Tested on i386. --- Lars Hansson
Re: UPDATE: sysutils/runit
Am Freitag, den 08.12.2006, 21:51 +0800 schrieb Lars Hansson: This diff updates sysutils/runit to 1.7.2. Major differences from the previous port: * service directory moved from /service to /var/service * the programs runsvctrl, runsvstat, svwaitdown, and svwaitup have been combined into one program, sv. The bulk of this update was done by Toni Mueller. remove files/runsvdir-start, is not need any more Tested on sparc64 p.s.: don't forget the my updates for socklog and ipsvd, lars -- [ christian rueger ] [ [EMAIL PROTECTED] ] [ cr.rueger-net.de ]
