1
0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00

Bump kernel ethtool get/set wait to 20 + ifupdown2 convert ethtool

errors to warns

Ticket: CM-3159
Reviewed By: briefly ran this by jtoppins and andy (sfeldma is on
vacation this week).
Testing Done: tested ifupdown2 with ethtool config during boot (sam will
also be adding the testcase mentioned in the bug to ifupdown2 smoke)

The kernel timeout increase helps right now.
we should revisit this again in 2.3 to close all corner cases.

ifupdown2 will now warn on ethtool errors and will also return
non-zero exit status
This commit is contained in:
Roopa Prabhu
2014-07-08 08:52:05 -07:00
parent 89aa6573d6
commit df4cba54e2

View File

@ -84,7 +84,7 @@ class ifaceScheduler():
err = 0 # error can be ignored by log_error, in which case
# reset err flag
finally:
if err:
if err or ifaceobj.status == ifaceStatus.ERROR:
ifaceobj.set_state_n_status(ifaceState.from_str(op),
ifaceStatus.ERROR)
if 'up' in op or 'down' in op: