From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9EE091382C5 for ; Thu, 17 Dec 2020 19:05:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9A8FE0871; Thu, 17 Dec 2020 19:05:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0707E0871 for ; Thu, 17 Dec 2020 19:05:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5A49340E72 for ; Thu, 17 Dec 2020 19:05:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1578956 for ; Thu, 17 Dec 2020 19:05:36 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1608231917.417b65612199c4dd4cdf20eb83d7e08f1771dcb0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/kea/, net-misc/kea/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/kea/files/kea-initd-r1 net-misc/kea/kea-1.8.1-r1.ebuild net-misc/kea/kea-1.8.1.ebuild X-VCS-Directories: net-misc/kea/files/ net-misc/kea/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 417b65612199c4dd4cdf20eb83d7e08f1771dcb0 X-VCS-Branch: master Date: Thu, 17 Dec 2020 19:05:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 667fe883-ffc1-45c8-90a0-99b02c77a7b2 X-Archives-Hash: 67fd323baa6daeb41142be03d9a0b6ab commit: 417b65612199c4dd4cdf20eb83d7e08f1771dcb0 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 17 19:04:36 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 17 19:05:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417b6561 net-misc/kea: Revbump to fix broken config file check in init script Thanks-to: Oleg Davydov gmail.com> Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> net-misc/kea/files/kea-initd-r1 | 20 +++++++++++++++----- .../kea/{kea-1.8.1.ebuild => kea-1.8.1-r1.ebuild} | 0 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/net-misc/kea/files/kea-initd-r1 b/net-misc/kea/files/kea-initd-r1 index 57711b3c9d3..00c493f14be 100644 --- a/net-misc/kea/files/kea-initd-r1 +++ b/net-misc/kea/files/kea-initd-r1 @@ -19,24 +19,34 @@ depend() { } start_pre() { - if [ ! -f "${config_file}" ] ; then - eerror "Please create a ${config_file} config file." - return 1 - fi - if ${DHCP4:-false} ; then + if [ ! -f "${dhcp4_config}" ] ; then + eerror "Please create a ${dhcp4_config} config file." + return 1 + fi + if ! ${dhcp4_command} -t ${dhcp4_config} 1>/dev/null 2>/dev/null ; then eerror "Error in config file ${dhcp4_config}" return 1 fi fi if ${DHCP6:-false} ; then + if [ ! -f "${dhcp6_config}" ] ; then + eerror "Please create a ${dhcp6_file} config file." + return 1 + fi + if ! ${dhcp6_command} -t ${dhcp6_config} 1>/dev/null 2>/dev/null ; then eerror "Error in config file ${dhcp6_config}" return 1 fi fi if ${DDNS:-false} ; then + if [ ! -f "${ddns_config}" ] ; then + eerror "Please create a ${ddns_config} config file." + return 1 + fi + if ! ${ddns_command} -t ${ddns_config} 1>/dev/null 2>/dev/null ; then eerror "Error in config file ${ddns_config}" return 1 diff --git a/net-misc/kea/kea-1.8.1.ebuild b/net-misc/kea/kea-1.8.1-r1.ebuild similarity index 100% rename from net-misc/kea/kea-1.8.1.ebuild rename to net-misc/kea/kea-1.8.1-r1.ebuild