From f789823ddacc73cc09f93e93a4f30fec4905a0d7 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Mon, 31 Aug 2020 17:56:22 +0200 Subject: [PATCH] resolver-conf: rename old,del action for dhcp_host_domain_ng Note: This fixes switch form dnsmasq --dhcp-script to dhcp-script.sh where del and old actions were renamed to remove and update Co-authored-by: M. Reiser Signed-off-by: Jan Pavlinec --- net/resolver-conf/Makefile | 2 +- net/resolver-conf/files/dhcp_host_domain_ng.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/resolver-conf/Makefile b/net/resolver-conf/Makefile index f77c3cadd..656e35460 100644 --- a/net/resolver-conf/Makefile +++ b/net/resolver-conf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=resolver-conf PKG_VERSION:=0.0.2 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/resolver-conf/files/dhcp_host_domain_ng.py b/net/resolver-conf/files/dhcp_host_domain_ng.py index 78e6e628b..e52823d2d 100755 --- a/net/resolver-conf/files/dhcp_host_domain_ng.py +++ b/net/resolver-conf/files/dhcp_host_domain_ng.py @@ -261,14 +261,14 @@ class DHCPv4: if op == "add": self._add_lease(hostname, ipv4) log("DHCP add new hostname [%s,%s]" % (hostname, ipv4), LOG_INFO) - elif op == "del": + elif op == "remove": self._del_lease(hostname, ipv4) - log("DHCP delete hostname [%s,%s,%s]" % (op, hostname, ipv4), LOG_INFO) - elif op == "old": + log("DHCP remove hostname [%s,%s]" % (hostname, ipv4), LOG_INFO) + elif op == "update": self._add_lease(hostname, ipv4) - log("DHCP update hostname [%s,%s,%s]" % (op, hostname, ipv4), LOG_INFO) + log("DHCP update hostname [%s,%s]" % (hostname, ipv4), LOG_INFO) else: - log("DHCP unknown update operation", LOG_WARNING) + log("DHCP unknown operation [%s,%s,%s]" % (op, hostname, ipv4), LOG_WARNING) def save_leases(self, overwrite=True): with open(self.__dhcp_leases_out_file, "w") as fp: -- GitLab