From 82aaa413f5eaacff4ce22ead741d82a2b4b6062a Mon Sep 17 00:00:00 2001
From: Julien Kassar <juliengk@users.noreply.github.com>
Date: Wed, 24 Jan 2018 20:47:17 -0500
Subject: [PATCH] Fix format 'verbs' (#2115)

---
 cmd/control/install.go | 2 +-
 cmd/network/network.go | 2 +-
 cmd/sysinit/sysinit.go | 7 ++++---
 config/data_funcs.go   | 2 +-
 dfs/scratch.go         | 4 ++--
 init/init.go           | 2 +-
 log/showuserlog.go     | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cmd/control/install.go b/cmd/control/install.go
index 7ae7fa1a..433077d3 100755
--- a/cmd/control/install.go
+++ b/cmd/control/install.go
@@ -256,7 +256,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 					cmd := exec.Command("system-docker", "load", "-i", "/bootiso/rancheros/installer.tar.gz")
 					cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
 					if err := cmd.Run(); err != nil {
-						log.Infof("failed to load images from /bootiso/rancheros: %s", err)
+						log.Infof("failed to load images from /bootiso/rancheros: %v", err)
 					} else {
 						log.Infof("Loaded images from /bootiso/rancheros/installer.tar.gz")
 
diff --git a/cmd/network/network.go b/cmd/network/network.go
index 366bf01d..9db85d1f 100755
--- a/cmd/network/network.go
+++ b/cmd/network/network.go
@@ -70,7 +70,7 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) {
 	}
 
 	resolve, err := ioutil.ReadFile("/etc/resolv.conf")
-	log.Debugf("Resolve.conf == [%s], %s", resolve, err)
+	log.Debugf("Resolve.conf == [%s], %v", resolve, err)
 
 	log.Infof("Apply Network Config SyncHostname")
 	if err := hostname.SyncHostname(); err != nil {
diff --git a/cmd/sysinit/sysinit.go b/cmd/sysinit/sysinit.go
index 55b2c3f7..2585d283 100644
--- a/cmd/sysinit/sysinit.go
+++ b/cmd/sysinit/sysinit.go
@@ -1,17 +1,18 @@
 package sysinit
 
 import (
-	initPkg "github.com/rancher/os/init"
-	"github.com/rancher/os/log"
 	"io/ioutil"
 	"os"
+
+	initPkg "github.com/rancher/os/init"
+	"github.com/rancher/os/log"
 )
 
 func Main() {
 	log.InitLogger()
 
 	resolve, err := ioutil.ReadFile("/etc/resolv.conf")
-	log.Infof("2Resolv.conf == [%s], %s", resolve, err)
+	log.Infof("Resolv.conf == [%s], %v", resolve, err)
 	log.Infof("Exec %v", os.Args)
 
 	if err := initPkg.SysInit(); err != nil {
diff --git a/config/data_funcs.go b/config/data_funcs.go
index 4b27f83a..82636d43 100755
--- a/config/data_funcs.go
+++ b/config/data_funcs.go
@@ -26,7 +26,7 @@ func ChainCfgFuncs(cfg *CloudConfig, cfgFuncs CfgFuncs) (*CloudConfig, error) {
 		}
 		var err error
 		if cfg, err = cfgFunc(cfg); err != nil {
-			log.Errorf("Failed [%d/%d] %s: %s", i, len, name, err)
+			log.Errorf("Failed [%d/%d] %s: %v", i, len, name, err)
 			return cfg, err
 		}
 		log.Debugf("[%d/%d] Done %s", i, len, name)
diff --git a/dfs/scratch.go b/dfs/scratch.go
index 7c879d92..b9be75b1 100644
--- a/dfs/scratch.go
+++ b/dfs/scratch.go
@@ -75,7 +75,7 @@ func createOptionalMounts(mounts ...[]string) {
 		log.Debugf("Mounting %s %s %s %s", mount[0], mount[1], mount[2], mount[3])
 		err := util.Mount(mount[0], mount[1], mount[2], mount[3])
 		if err != nil {
-			log.Debugf("Unable to mount %s %s %s %s: %s", mount[0], mount[1], mount[2], mount[3], err)
+			log.Debugf("Unable to mount %s %s %s %s: %v", mount[0], mount[1], mount[2], mount[3], err)
 		}
 	}
 }
@@ -354,7 +354,7 @@ ff02::2    ip6-allrouters
 
 	if len(cfg.DNSConfig.Nameservers) != 0 {
 		resolve, err := ioutil.ReadFile("/etc/resolv.conf")
-		log.Debugf("Resolve.conf == [%s], err", resolve, err)
+		log.Debugf("Resolve.conf == [%s], %v", resolve, err)
 
 		if err != nil {
 			log.Infof("scratch Writing empty resolv.conf (%v) %v", []string{}, []string{})
diff --git a/init/init.go b/init/init.go
index 24343881..f11342a7 100755
--- a/init/init.go
+++ b/init/init.go
@@ -252,7 +252,7 @@ func RunInit() error {
 			config.SaveInitCmdline(cmdLineArgs)
 
 			cfg := config.LoadConfig()
-			log.Debugf("Cmdline debug = %s", cfg.Rancher.Debug)
+			log.Debugf("Cmdline debug = %t", cfg.Rancher.Debug)
 			if cfg.Rancher.Debug {
 				log.SetLevel(log.DebugLevel)
 			} else {
diff --git a/log/showuserlog.go b/log/showuserlog.go
index eae27215..de67e57f 100644
--- a/log/showuserlog.go
+++ b/log/showuserlog.go
@@ -64,7 +64,7 @@ func (hook *ShowuserlogHook) NotUsedYetLogSystemReady() error {
 	if hook.syslogHook == nil {
 		h, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
 		if err != nil {
-			logrus.Debugf("error creating SyslogHook: %s", err)
+			logrus.Debugf("error creating SyslogHook: %v", err)
 			return err
 		}
 		hook.syslogHook = h