[gentoo-commits] repo/gentoo:master commit in: net-misc/kea/, net-misc/kea/files/

[Lars Wendler]

commit:     417b65612199c4dd4cdf20eb83d7e08f1771dcb0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 19:04:36 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <burunduk3 <AT> gmail.com>
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> 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