Included /usr/bin/sh in the test root filesystem. Review: https://reviews.apache.org/r/37555
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3ae937fb Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3ae937fb Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3ae937fb Branch: refs/heads/master Commit: 3ae937fb1c41bf858d7e37e5679da646fe93734b Parents: bd4332c Author: Jie Yu <[email protected]> Authored: Mon Aug 17 12:53:08 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Mon Aug 17 14:27:31 2015 -0700 ---------------------------------------------------------------------- src/tests/containerizer/rootfs.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3ae937fb/src/tests/containerizer/rootfs.hpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/rootfs.hpp b/src/tests/containerizer/rootfs.hpp index 55dd496..961003f 100644 --- a/src/tests/containerizer/rootfs.hpp +++ b/src/tests/containerizer/rootfs.hpp @@ -116,6 +116,15 @@ public: } } + // 'sh' is under '/usr/bin' on CentOS 7.1. + if (os::exists("/usr/bin/sh")) { + Try<Nothing> result = rootfs->add("/usr/bin/sh"); + if (result.isError()) { + return Error("Failed to add '/usr/bin/sh' to rootfs: " + + result.error()); + } + } + directories = { "/proc", "/sys",
