Repository: mesos Updated Branches: refs/heads/master 08aa92b2a -> 7e54d3df7
Change ethtool check to not output to stderr. Review: https://reviews.apache.org/r/41245 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7e54d3df Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7e54d3df Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7e54d3df Branch: refs/heads/master Commit: 7e54d3df715f889578dce90752ae79f6df6de6a2 Parents: 08aa92b Author: Cong Wang <[email protected]> Authored: Fri Dec 11 11:25:02 2015 -0800 Committer: Ian Downes <[email protected]> Committed: Fri Dec 11 11:26:06 2015 -0800 ---------------------------------------------------------------------- src/slave/containerizer/mesos/isolators/network/port_mapping.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7e54d3df/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp index 7c1724a..49e215b 100644 --- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp @@ -1094,7 +1094,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) return Error("Check command 'tc' failed: " + checkCommandTc.error()); } - Try<string> checkCommandEthtool = os::shell("ethtool --version"); + // NOTE: loopback device always exists. + Try<string> checkCommandEthtool = os::shell("ethtool -k lo"); if (checkCommandEthtool.isError()) { return Error("Check command 'ethtool' failed: " + checkCommandEthtool.error());
