Skip to content

Commit

Permalink
Revert "netmonitor: timeout calling dhcpcd executable"
Browse files Browse the repository at this point in the history
This reverts commit 5ee5bd9.
  • Loading branch information
rouming committed Oct 9, 2023
1 parent be2973c commit 54cb7f4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/pillar/netmonitor/linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 54cb7f4

Please sign in to comment.