From 54cb7f45273739dc72a0a9064f5a6622d1d755e0 Mon Sep 17 00:00:00 2001 From: Roman Penyaev Date: Mon, 9 Oct 2023 11:25:50 +0200 Subject: [PATCH] Revert "netmonitor: timeout calling dhcpcd executable" This reverts commit 5ee5bd97ff6a15038ab848f8777cd80d6990a47a. --- pkg/pillar/netmonitor/linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pillar/netmonitor/linux.go b/pkg/pillar/netmonitor/linux.go index d7ece812b91..31eff967a42 100644 --- a/pkg/pillar/netmonitor/linux.go +++ b/pkg/pillar/netmonitor/linux.go @@ -257,7 +257,7 @@ func (m *LinuxNetworkMonitor) GetInterfaceDHCPInfo(ifIndex int) (info DHCPInfo, // XXX Getting error -1 unless we add argument -4. // XXX Add IPv6 support. m.Log.Functionf("Calling dhcpcd -U -4 %s\n", ifName) - stdoutStderr, err := base.Exec(m.Log, "dhcpcd", "-U", "-4", ifName).CombinedOutputWithTimeout() + stdoutStderr, err := base.Exec(m.Log, "dhcpcd", "-U", "-4", ifName).CombinedOutput() if err != nil { if strings.Contains(string(stdoutStderr), "dhcp_dump: No such file or directory") { // DHCP is not configured for this interface. Return empty DHCPInfo.