From e608377088e3b681964ea9943ffbe792a91b5159 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Fri, 14 Oct 2016 10:48:32 -0700
Subject: [PATCH] Write /run/console-done before executing /etc/rc.local

---
 cmd/console/console.go                | 9 +++++----
 tests/assets/test_26/cloud-config.yml | 5 +++--
 tests/start_commands_test.go          | 3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cmd/console/console.go b/cmd/console/console.go
index 3be06437..c8547286 100644
--- a/cmd/console/console.go
+++ b/cmd/console/console.go
@@ -111,6 +111,11 @@ func Main() {
 	if err := runScript(startScript); err != nil {
 		log.Error(err)
 	}
+
+	if err := ioutil.WriteFile(consoleDone, []byte(cfg.Rancher.Console), 0644); err != nil {
+		log.Error(err)
+	}
+
 	if err := runScript("/etc/rc.local"); err != nil {
 		log.Error(err)
 	}
@@ -122,10 +127,6 @@ func Main() {
 		log.Fatal(err)
 	}
 
-	if err := ioutil.WriteFile(consoleDone, []byte(cfg.Rancher.Console), 0644); err != nil {
-		log.Error(err)
-	}
-
 	log.Fatal(syscall.Exec(respawnBinPath, []string{"respawn", "-f", "/etc/respawn.conf"}, os.Environ()))
 }
 
diff --git a/tests/assets/test_26/cloud-config.yml b/tests/assets/test_26/cloud-config.yml
index b419922d..b74010dc 100644
--- a/tests/assets/test_26/cloud-config.yml
+++ b/tests/assets/test_26/cloud-config.yml
@@ -15,13 +15,14 @@ write_files:
   permissions: "0755"
   owner: root
   content: |
-    touch /home/rancher/test4
+    wait-for-docker
+    docker run -d nginx
 - path: /var/lib/rancher/conf/cloud-config-script
   permissions: "0755"
   owner: root
   content: |
     #!/bin/bash
-    touch /home/rancher/test5
+    touch /home/rancher/test4
 runcmd:
 - []
 - [ test ]
diff --git a/tests/start_commands_test.go b/tests/start_commands_test.go
index d29adab7..2b36928b 100644
--- a/tests/start_commands_test.go
+++ b/tests/start_commands_test.go
@@ -10,7 +10,8 @@ func (s *QemuSuite) TestStartCommands(c *C) {
 	err := s.RunQemu("--cloud-config", "./tests/assets/test_26/cloud-config.yml")
 	c.Assert(err, IsNil)
 
-	for i := 1; i < 6; i++ {
+	for i := 1; i < 5; i++ {
 		s.CheckCall(c, fmt.Sprintf("ls /home/rancher | grep test%d", i))
 	}
+	s.CheckCall(c, "docker ps | grep nginx")
 }