X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 9A8DEDC06AB for ; Thu, 23 Jul 2015 23:32:06 +0000 (UTC) Received: from apollo.thewebhostserver.com (apollomail.thewebhostserver.com [46.23.65.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 5ACAEDC00B1 for ; Thu, 23 Jul 2015 23:32:04 +0000 (UTC) Received: from [81.4.121.188] (port=54294 helo=localhost.localdomain) by apollo.thewebhostserver.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.85) (envelope-from ) id 1ZIPy4-000SG8-IF; Fri, 24 Jul 2015 00:32:00 +0100 From: Stuart Cardall To: alpine-aports@lists.alpinelinux.org Cc: Stuart Cardall Subject: [alpine-aports] [PATCH v3] testing/runit: fix init script + doc typo Date: Thu, 23 Jul 2015 23:31:42 +0000 Message-Id: <1437694302-4168-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 2.4.6 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - apollo.thewebhostserver.com X-AntiAbuse: Original Domain - lists.alpinelinux.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - it-offshore.co.uk X-Get-Message-Sender-Via: apollo.thewebhostserver.com: authenticated_id: developer@it-offshore.co.uk X-Source: X-Source-Args: X-Source-Dir: X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: runit runs ok without a symlink to /etc/service in /run but without it sv commands do not work properly. --- Changes v1 -> v3: + fix init script + fix small type in doc --- testing/runit/APKBUILD | 14 +++++++------- testing/runit/README.alpine | 2 +- testing/runit/runit.initd | 9 +++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/testing/runit/APKBUILD b/testing/runit/APKBUILD index c484d6e..ec120da 100644 --- a/testing/runit/APKBUILD +++ b/testing/runit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall pkgname=runit pkgver=2.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="UNIX init scheme with service supervision" url="http://smarden.org/runit/" arch="all" @@ -54,13 +54,13 @@ package() { md5sums="6c985fbfe3a34608eb3c53dc719172c4 runit-2.1.2.tar.gz dc4e4b469451497e37cb295136a9b23b run-service-dir.patch -6ad1a147996f44854152dc8e650035ce README.alpine -5399d00c9d611116ae697437dfc48527 runit.initd" +83c4afc69c119a070bf9fec41be1b2a2 README.alpine +63d2602ca4df1ee4fc9a6cf10507f60c runit.initd" sha256sums="6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 runit-2.1.2.tar.gz 4f4df10f35cd103d7cab27d34f4586f2099b4c5a4e007bdc8299196434744c77 run-service-dir.patch -1869a548fda50efeebad59d7178fe6b4fafca8b16067213c258e7e1e21d56e3e README.alpine -5b1c05d674fbe863800c1d4ef03aaaa6b466d02297801ef759b126911c50f3a4 runit.initd" +335bc330671a361627c9e8d81a3afecdedab3dd2b17a36f4f0b2a3084469e9ab README.alpine +d9bebf02cfc0434b570059270e3ab5f40ce03d3ea620fbdabe39258785c979f1 runit.initd" sha512sums="a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf runit-2.1.2.tar.gz 195102ea27119700d13279a4265e730ea4d682293b52b5a036481057100de9e7865f77f96d027f4d8e774901beaa7f1f3818e17451d359d1be31cc3759db9646 run-service-dir.patch -f6a5ffa9ea9c0e6c76afd92412b5a14ad76695855808274b21c1c0009248019b77b780b4d3d0040c8c3cc4529fc58cdfebec6ea46a9c98ce40df6b4be9ea53bb README.alpine -6f2f2c861f931ce95de791c138e854f7e5ea22c67c81b9ddb146aec07caecdc4ea366075a5ad18372947c58b290fa5186f35345ec6c1451a4d702dd695da1251 runit.initd" +066edd570cb60fa15b580fb2f9c80835569020829fb5893db6d2e3003148b0c78225fba6886a5520a1e203d1b55f6b05b287c0ca9cce5f62c3052d007b2e7791 README.alpine +89dd8fbcb25febeeb33dbc6d242ee80d533090e986bd750edb7e90d07a4957d3c936ffffaa849f616cdcb49fa1a899d616a514f8c657c516b4131de9badb4661 runit.initd" diff --git a/testing/runit/README.alpine b/testing/runit/README.alpine index fe9141c..16fb7dc 100644 --- a/testing/runit/README.alpine +++ b/testing/runit/README.alpine @@ -21,7 +21,7 @@ Example: /etc/sv/tinyssh/run | #!/bin/sh PORT=22 mkdir -p /etc/tinyssh -/usr/sbin/tinysshd-makekey /etc/tinyssh/keys 2>/dev/null +/usr/sbin/tinysshd-makekey /etc/tinyssh/sshkeys 2>/dev/null exec tcpserver -HRDl0 0.0.0.0 $PORT /usr/sbin/tinysshd -v -l /etc/tinyssh/sshkeys --------------------------------------------------------------------------------- diff --git a/testing/runit/runit.initd b/testing/runit/runit.initd index 59fd4a4..979b7c6 100644 --- a/testing/runit/runit.initd +++ b/testing/runit/runit.initd @@ -2,6 +2,7 @@ command="/sbin/runsvdir" command_args="/etc/service" +rundir="/run/service" pidfile="/run/${SVCNAME}.pid" command_background="true" description="starts and monitors a collection of runsv(8) processes" @@ -9,4 +10,12 @@ retry="SIGHUP/5" depend() { need localmount + after firewall } + +start_pre() { + if [ ! -L "$rundir" ]; then + rm -f $rundir && ln -s $command_args $rundir + fi +} + -- 2.4.6 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---