From 6bd52cea7f99567a2496be12568df5a79305a842 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Sun, 4 Dec 2016 09:32:03 -0800
Subject: [PATCH] Move all command bind mounts to symlinks

---
 cmd/control/entrypoint.go | 11 +++++++++--
 os-config.tpl.yml         |  8 --------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cmd/control/entrypoint.go b/cmd/control/entrypoint.go
index 32df1187..4d4b9083 100644
--- a/cmd/control/entrypoint.go
+++ b/cmd/control/entrypoint.go
@@ -45,7 +45,7 @@ func entrypointAction(c *cli.Context) error {
 		writeFiles(cfg)
 	}
 
-	setupPowerOperations()
+	setupCommandSymlinks()
 
 	if len(os.Args) < 3 {
 		return nil
@@ -77,7 +77,7 @@ func writeFiles(cfg *config.CloudConfig) error {
 	return nil
 }
 
-func setupPowerOperations() {
+func setupCommandSymlinks() {
 	for _, powerOperation := range []string{
 		"/sbin/poweroff",
 		"/sbin/shutdown",
@@ -92,6 +92,13 @@ func setupPowerOperations() {
 	}
 
 	for _, link := range []symlink{
+		{config.RosBin, "/usr/bin/cloud-init-execute"},
+		{config.RosBin, "/usr/bin/cloud-init-save"},
+		{config.RosBin, "/usr/bin/dockerlaunch"},
+		{config.RosBin, "/usr/bin/respawn"},
+		{config.RosBin, "/usr/bin/system-docker"},
+		{config.RosBin, "/usr/sbin/netconf"},
+		{config.RosBin, "/usr/sbin/wait-for-docker"},
 		{config.RosBin, "/sbin/poweroff"},
 		{config.RosBin, "/sbin/reboot"},
 		{config.RosBin, "/sbin/halt"},
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 7f6d80a2..7ad2606e 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -117,7 +117,6 @@ rancher:
       - system-volumes
       volumes:
       - /usr/bin/ros:/usr/bin/ros
-      - /usr/bin/ros:/usr/bin/cloud-init-execute
     command-volumes:
       image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
       command: echo
@@ -129,14 +128,7 @@ rancher:
       privileged: true
       read_only: true
       volumes:
-      - /usr/bin/ros:/usr/bin/dockerlaunch:ro
-      - /usr/bin/ros:/usr/bin/system-docker:ro
-      - /usr/bin/ros:/usr/bin/respawn:ro
       - /usr/bin/ros:/usr/bin/ros:ro
-      - /usr/bin/ros:/usr/bin/cloud-init-execute:ro
-      - /usr/bin/ros:/usr/bin/cloud-init-save:ro
-      - /usr/bin/ros:/usr/sbin/netconf:ro
-      - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
       - /usr/share/rancher:/usr/share/rancher:ro
     console:
       image: {{.OS_REPO}}/os-console:{{.VERSION}}{{.SUFFIX}}