From 07cc5a430a6d1fd1e5828a63116765d33d41393c Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Fri, 17 Jun 2016 09:41:33 -0700
Subject: [PATCH] Make rancher.debug control bootstrap Docker and turn on log

---
 config/disk.go | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/config/disk.go b/config/disk.go
index 0d990fa5..282bebb8 100644
--- a/config/disk.go
+++ b/config/disk.go
@@ -91,18 +91,26 @@ func applyDebugFlags(rawCfg map[interface{}]interface{}) map[interface{}]interfa
 		return rawCfg
 	}
 
-	if cfg.Rancher.Debug {
-		log.SetLevel(log.DebugLevel)
-		if !util.Contains(cfg.Rancher.Docker.Args, "-D") {
-			cfg.Rancher.Docker.Args = append(cfg.Rancher.Docker.Args, "-D")
-		}
-		if !util.Contains(cfg.Rancher.SystemDocker.Args, "-D") {
-			cfg.Rancher.SystemDocker.Args = append(cfg.Rancher.SystemDocker.Args, "-D")
-		}
+	if !cfg.Rancher.Debug {
+		return rawCfg
+	}
+
+	log.SetLevel(log.DebugLevel)
+	if !util.Contains(cfg.Rancher.Docker.Args, "-D") {
+		cfg.Rancher.Docker.Args = append(cfg.Rancher.Docker.Args, "-D")
+	}
+	if !util.Contains(cfg.Rancher.SystemDocker.Args, "-D") {
+		cfg.Rancher.SystemDocker.Args = append(cfg.Rancher.SystemDocker.Args, "-D")
+	}
+	if !util.Contains(cfg.Rancher.BootstrapDocker.Args, "-D") {
+		cfg.Rancher.BootstrapDocker.Args = append(cfg.Rancher.BootstrapDocker.Args, "-D")
 	}
 
 	_, rawCfg = getOrSetVal("rancher.docker.args", rawCfg, cfg.Rancher.Docker.Args)
 	_, rawCfg = getOrSetVal("rancher.system_docker.args", rawCfg, cfg.Rancher.SystemDocker.Args)
+	_, rawCfg = getOrSetVal("rancher.bootstrap_docker.args", rawCfg, cfg.Rancher.BootstrapDocker.Args)
+	_, rawCfg = getOrSetVal("rancher.log", rawCfg, true)
+
 	return rawCfg
 }