From 5358dfceb80f83c8e25c0a0c0259e0d6bf6b74c3 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Mon, 6 Jul 2020 02:43:26 +0200 Subject: [PATCH] addons: dhcp: don't raise an exception after dhcp retry-failure Signed-off-by: Julien Fortin --- ifupdown2/addons/dhcp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ifupdown2/addons/dhcp.py b/ifupdown2/addons/dhcp.py index 71a8bdf..ef75964 100644 --- a/ifupdown2/addons/dhcp.py +++ b/ifupdown2/addons/dhcp.py @@ -123,7 +123,8 @@ class dhcp(Addon, moduleBase): % (ifname, retry) ) else: - raise Exception("%s: dhclient: timeout failed to detect new ip addresses" % ifname) + self.logger.error("%s: dhclient: timeout failed to detect new ip addresses" % ifname) + return -1 finally: self.logger.info("%s: releasing expired dhcp lease..." % ifname) self.dhclientcmd.release(ifname, dhclient_cmd_prefix)