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 37E14DC8731 for ; Wed, 5 Aug 2015 01:35:38 +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 EF3A3DC5DD3 for ; Wed, 5 Aug 2015 01:35:36 +0000 (UTC) Received: from [81.4.121.188] (port=49797 helo=localhost.localdomain) by apollo.thewebhostserver.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.85) (envelope-from ) id 1ZMncD-003zb9-RE; Wed, 05 Aug 2015 02:35:33 +0100 From: Stuart Cardall To: alpine-aports@lists.alpinelinux.org Cc: Stuart Cardall Subject: [alpine-aports] [PATCH] testing/runit: change service dir Date: Wed, 5 Aug 2015 01:35:24 +0000 Message-Id: <1438738524-3492-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 2.5.0 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: changes the service directory to /etc/service --- testing/runit/APKBUILD | 14 +++++++------- testing/runit/run-service-dir.patch | 2 +- testing/runit/runit.initd | 7 ------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/testing/runit/APKBUILD b/testing/runit/APKBUILD index ec120da..629d5ee 100644 --- a/testing/runit/APKBUILD +++ b/testing/runit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall pkgname=runit pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="UNIX init scheme with service supervision" url="http://smarden.org/runit/" arch="all" @@ -53,14 +53,14 @@ package() { } md5sums="6c985fbfe3a34608eb3c53dc719172c4 runit-2.1.2.tar.gz -dc4e4b469451497e37cb295136a9b23b run-service-dir.patch +13b3d1e097d58c7fe78c8c2ae9c829ff run-service-dir.patch 83c4afc69c119a070bf9fec41be1b2a2 README.alpine -63d2602ca4df1ee4fc9a6cf10507f60c runit.initd" +ad11582ab279b929d84179b0c7f7b63e runit.initd" sha256sums="6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 runit-2.1.2.tar.gz -4f4df10f35cd103d7cab27d34f4586f2099b4c5a4e007bdc8299196434744c77 run-service-dir.patch +b051476a9cea0673cdd3f849c33555e364540f49436ab7d05f5aeee553d84ab7 run-service-dir.patch 335bc330671a361627c9e8d81a3afecdedab3dd2b17a36f4f0b2a3084469e9ab README.alpine -d9bebf02cfc0434b570059270e3ab5f40ce03d3ea620fbdabe39258785c979f1 runit.initd" +787fe8cf59619b6d0e48bb244fe326c9c599c9df73342a2d44ef64ebe2861369 runit.initd" sha512sums="a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf runit-2.1.2.tar.gz -195102ea27119700d13279a4265e730ea4d682293b52b5a036481057100de9e7865f77f96d027f4d8e774901beaa7f1f3818e17451d359d1be31cc3759db9646 run-service-dir.patch +7107da162f7c13e1483f17bf04a844c23a8d1b81ef982c3d956a4c0e23b2a20e415850f0b95999b1eb1e04638284884948937377756ca080037bd6455e3301e8 run-service-dir.patch 066edd570cb60fa15b580fb2f9c80835569020829fb5893db6d2e3003148b0c78225fba6886a5520a1e203d1b55f6b05b287c0ca9cce5f62c3052d007b2e7791 README.alpine -89dd8fbcb25febeeb33dbc6d242ee80d533090e986bd750edb7e90d07a4957d3c936ffffaa849f616cdcb49fa1a899d616a514f8c657c516b4131de9badb4661 runit.initd" +118c43eabacf789841146d1cc051a66b55700787e41a3f68837d69667b30863477816fda276461d253cced0299d3f15a2a2ef26350159a150afe7c9504bc248c runit.initd" diff --git a/testing/runit/run-service-dir.patch b/testing/runit/run-service-dir.patch index f01dcc2..eff50b0 100644 --- a/testing/runit/run-service-dir.patch +++ b/testing/runit/run-service-dir.patch @@ -5,7 +5,7 @@ char *action; char *acts; -char *varservice ="/service/"; -+char *varservice ="/run/service/"; ++char *varservice ="/etc/service/"; char **service; char **servicex; unsigned int services; diff --git a/testing/runit/runit.initd b/testing/runit/runit.initd index 979b7c6..2f3a096 100644 --- a/testing/runit/runit.initd +++ b/testing/runit/runit.initd @@ -2,7 +2,6 @@ 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" @@ -13,9 +12,3 @@ depend() { after firewall } -start_pre() { - if [ ! -L "$rundir" ]; then - rm -f $rundir && ln -s $command_args $rundir - fi -} - -- 2.5.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---