From bffe4e5d3e012fea3083ca0fe8e901785f80ff3a Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Thu, 25 Aug 2016 16:04:31 -0700
Subject: [PATCH] Fix upgrades from persistent consoles

---
 scripts/layout | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/layout b/scripts/layout
index 408944f6..53fd362f 100755
--- a/scripts/layout
+++ b/scripts/layout
@@ -26,6 +26,11 @@ 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
 
+# Support upgrades from old persistent consoles that bind mount these
+touch ${INITRD_DIR}/usr/bin/docker-containerd
+touch ${INITRD_DIR}/usr/bin/docker-containerd-shim
+touch ${INITRD_DIR}/usr/bin/docker
+
 if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
     mkdir -p ${BUILD}/kernel
     tar xf ${DOWNLOADS}/kernel.tar.gz -C ${BUILD}/kernel