X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from dal-a2.localdomain (unknown [74.117.189.115]) by mail.alpinelinux.org (Postfix) with ESMTP id 37008DC01FE for ; Mon, 9 Jun 2014 08:55:46 +0000 (UTC) Received: from ncopa-desktop.alpinelinux.org (3.203.202.84.customer.cdi.no [84.202.203.3]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: ncopa@tanael.org) by dal-a2.localdomain (Postfix) with ESMTPSA id 43AFEBC3E23; Mon, 9 Jun 2014 08:55:45 +0000 (UTC) Date: Mon, 9 Jun 2014 10:55:41 +0200 From: Natanael Copa To: Stuart Cardall Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH] main/tinc: fixed init scripts Message-ID: <20140609105541.61993a48@ncopa-desktop.alpinelinux.org> In-Reply-To: <1402136467-23144-1-git-send-email-developer@it-offshore.co.uk> References: <1402136467-23144-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: Claws Mail 3.10.0 (GTK+ 2.24.23; x86_64-alpine-linux-musl) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Sat, 7 Jun 2014 10:21:07 +0000 Stuart Cardall wrote: > This patch fixes an init script bug which caused 'restart' to fail > & which sometimes could only be cleared by a reboot (--localstatedir > was set as /usr/var so the pid was never found). ugh. good catch! > I changed 'stop' to use the start-stop-daemon as in tinc 1.1pre10 there > is no longer an option to --kill. Message for an already stopped daemon > corrected. Why are we not using start-stop-daemon for start? Can we reuse the gentoo init.d scripts? http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/tinc/files/tincd?revision=1.9 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/tinc/files/tincd.lo?revision=1.5&view=markup > For the same reason I also changed 'reload' to use kill -1 $pid. > --- > main/tinc/APKBUILD | 15 ++++++++------- > main/tinc/tincd.initd | 7 ++++--- > main/tinc/tincd.lo.initd | 9 +++++---- > 3 files changed, 17 insertions(+), 14 deletions(-) > > diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD > index ff98ecc..97674b3 100644 > --- a/main/tinc/APKBUILD > +++ b/main/tinc/APKBUILD > @@ -1,7 +1,7 @@ > # Maintainer: Natanael Copa > pkgname=tinc > pkgver=1.0.24 > -pkgrel=0 > +pkgrel=1 > pkgdesc="tinc is a Virtual Private Network (VPN) daemon" > url="http://www.tinc-vpn.org/" > arch="all" > @@ -35,6 +35,7 @@ build() { > --sysconfdir=/etc \ > --mandir=/usr/share/man \ > --infodir=/usr/share/info \ > + --localstatedir=/var \ > --enable-jumbograms \ > --enable-lzo \ > --enable-zlib \ I applied the patch due to the above hunk and copied new version of init.d from gentoo. Thanks! -nc --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---