Merge pull request #22005 from crosbymichael/runc-source

Improve source for containerd/runc copy
This commit is contained in:
Tibor Vass 2016-04-13 14:03:34 -04:00
commit 365d80b3e1

View file

@ -307,7 +307,7 @@ copy_containerd() {
if [ -x /usr/local/bin/docker-runc ]; then if [ -x /usr/local/bin/docker-runc ]; then
echo "Copying nested executables into $dir" echo "Copying nested executables into $dir"
for file in containerd containerd-shim containerd-ctr runc; do for file in containerd containerd-shim containerd-ctr runc; do
cp "/usr/local/bin/docker-$file" "$dir/" cp `which "docker-$file"` "$dir/"
if [ "$2" == "hash" ]; then if [ "$2" == "hash" ]; then
hash_files "$dir/docker-$file" hash_files "$dir/docker-$file"
fi fi