rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

Fix format 'verbs' (#2115)

Browse Source
This commit is contained in:
Julien Kassar
2018-01-24 20:47:17 -05:00
committed by niusmallnan
parent a08ad16a01
commit 82aaa413f5
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/install.go
View File

@@ -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")

2
cmd/network/network.go
View File

@@ -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 {

7
cmd/sysinit/sysinit.go
View File

@@ -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 {

2
config/data_funcs.go
View File

@@ -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)

4
dfs/scratch.go
View File

@@ -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{})

2
init/init.go
View File

@@ -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 {

2
log/showuserlog.go
View File

@@ -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