From 455e36bb0ef43902e79e06473e0a03edf3d32b18 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Tue, 16 Aug 2016 14:09:47 -0700
Subject: [PATCH] Strip more Docker binaries from DFS image

---
 scripts/layout | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/layout b/scripts/layout
index 911a0f78..408944f6 100755
--- a/scripts/layout
+++ b/scripts/layout
@@ -22,6 +22,7 @@ ln -s usr/bin/ros              ${INITRD_DIR}/init
 ln -s bin                      ${INITRD_DIR}/usr/sbin
 ln -s usr/sbin                 ${INITRD_DIR}/sbin
 ln -s ros                      ${INITRD_DIR}/usr/bin/system-docker
+ln -s ros                      ${INITRD_DIR}/usr/bin/docker-runc
 ln -s ../../../../usr/bin/ros  ${INITRD_DIR}/usr/var/lib/cni/bin/bridge
 ln -s ../../../../usr/bin/ros  ${INITRD_DIR}/usr/var/lib/cni/bin/host-local
 
@@ -52,8 +53,7 @@ fi
 DFS_ARCH=$(docker create ${DFS_IMAGE}${SUFFIX})
 trap "docker rm -fv ${DFS_ARCH} >/dev/null" EXIT
 
-docker export ${DFS_ARCH} | tar xf - -C ${INITRD_DIR} --exclude=usr/bin/dockerlaunch \
-                                                      --exclude=usr/bin/docker       \
+docker export ${DFS_ARCH} | tar xf - -C ${INITRD_DIR} --exclude=usr/bin/docker*      \
                                                       --exclude=usr/share/git-core   \
                                                       --exclude=usr/bin/git          \
                                                       --exclude=usr/bin/ssh          \