diff --git a/cmd/control/install.go b/cmd/control/install.go index ff27e833..f7d7ff4c 100644 --- a/cmd/control/install.go +++ b/cmd/control/install.go @@ -146,7 +146,7 @@ func installAction(c *cli.Context) error { partition := c.String("partition") statedir := c.String("statedir") if statedir != "" && installType != "noformat" { - log.Fatal("--statedir %s requires --type noformat", statedir) + log.Fatalf("--statedir %s requires --type noformat", statedir) } if installType != "noformat" && installType != "raid" && @@ -531,7 +531,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap if err != nil { return err } - log.Debugf("upgrading - %s, %s, %s, %s", device, baseName, diskType) + log.Debugf("upgrading - %s, %s, %s", device, baseName, diskType) // TODO: detect pv-grub, and don't kill it with syslinux upgradeBootloader(device, baseName, diskType) default: @@ -553,7 +553,13 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap Timeout: 0, Fallback: 0, // need to be conditional on there being a 'rollback'? Entries: []install.MenuEntry{ - install.MenuEntry{"BurmillaOS-current", config.BootDir, VERSION, kernelArgs, kappend}, + install.MenuEntry{ + Name: "BurmillaOS-current", + BootDir: config.BootDir, + Version: VERSION, + KernelArgs: kernelArgs, + Append: kappend, + }, }, } install.PvGrubConfig(menu) diff --git a/cmd/init/init.go b/cmd/init/init.go index 7e4fe4a2..0824e974 100644 --- a/cmd/init/init.go +++ b/cmd/init/init.go @@ -43,29 +43,29 @@ func MainInit() { func RunInit() error { initFuncs := config.CfgFuncs{ - {"set env", env.Init}, - {"preparefs", prepare.FS}, - {"save init cmdline", prepare.SaveCmdline}, - {"mount OEM", fsmount.MountOem}, - {"debug save cfg", debug.PrintAndLoadConfig}, - {"load modules", modules.LoadModules}, - {"recovery console", recovery.LoadRecoveryConsole}, - {"b2d env", b2d.B2D}, - {"mount STATE and bootstrap", fsmount.MountStateAndBootstrap}, - {"cloud-init", cloudinit.CloudInit}, - {"read cfg and log files", configfiles.ReadConfigFiles}, - {"switchroot", switchroot.SwitchRoot}, - {"mount OEM2", fsmount.MountOem}, - {"mount BOOT", fsmount.MountBoot}, - {"write cfg and log files", configfiles.WriteConfigFiles}, - {"b2d Env", b2d.Env}, - {"hypervisor tools", hypervisor.Tools}, - {"preparefs2", prepare.FS}, - {"load modules2", modules.LoadModules}, - {"set proxy env", env.Proxy}, - {"init SELinux", selinux.Initialize}, - {"setupSharedRoot", sharedroot.Setup}, - {"sysinit", sysinit.RunSysInit}, + {Name: "set env", Func: env.Init}, + {Name: "preparefs", Func: prepare.FS}, + {Name: "save init cmdline", Func: prepare.SaveCmdline}, + {Name: "mount OEM", Func: fsmount.MountOem}, + {Name: "debug save cfg", Func: debug.PrintAndLoadConfig}, + {Name: "load modules", Func: modules.LoadModules}, + {Name: "recovery console", Func: recovery.LoadRecoveryConsole}, + {Name: "b2d env", Func: b2d.B2D}, + {Name: "mount STATE and bootstrap", Func: fsmount.MountStateAndBootstrap}, + {Name: "cloud-init", Func: cloudinit.CloudInit}, + {Name: "read cfg and log files", Func: configfiles.ReadConfigFiles}, + {Name: "switchroot", Func: switchroot.SwitchRoot}, + {Name: "mount OEM2", Func: fsmount.MountOem}, + {Name: "mount BOOT", Func: fsmount.MountBoot}, + {Name: "write cfg and log files", Func: configfiles.WriteConfigFiles}, + {Name: "b2d Env", Func: b2d.Env}, + {Name: "hypervisor tools", Func: hypervisor.Tools}, + {Name: "preparefs2", Func: prepare.FS}, + {Name: "load modules2", Func: modules.LoadModules}, + {Name: "set proxy env", Func: env.Proxy}, + {Name: "init SELinux", Func: selinux.Initialize}, + {Name: "setupSharedRoot", Func: sharedroot.Setup}, + {Name: "sysinit", Func: sysinit.RunSysInit}, } cfg, err := config.ChainCfgFuncs(nil, initFuncs) diff --git a/config/cloudinit/datasource/metadata/test/test.go b/config/cloudinit/datasource/metadata/test/test.go index dcc1a7cf..f6351bf4 100644 --- a/config/cloudinit/datasource/metadata/test/test.go +++ b/config/cloudinit/datasource/metadata/test/test.go @@ -32,7 +32,7 @@ func (t *HTTPClient) GetRetry(url string) ([]byte, error) { if val, ok := t.Resources[url]; ok { return []byte(val), nil } - return nil, pkg.ErrNotFound{fmt.Errorf("not found: %q", url)} + return nil, pkg.ErrNotFound{Err: fmt.Errorf("not found: %q", url)} } func (t *HTTPClient) Get(url string) ([]byte, error) { diff --git a/pkg/init/bootstrap/bootstrap.go b/pkg/init/bootstrap/bootstrap.go index cf8e4e83..fb530396 100644 --- a/pkg/init/bootstrap/bootstrap.go +++ b/pkg/init/bootstrap/bootstrap.go @@ -32,8 +32,8 @@ func Bootstrap(cfg *config.CloudConfig) error { _, err = config.ChainCfgFuncs(cfg, []config.CfgFuncData{ - {"bootstrap loadImages", sysinit.LoadBootstrapImages}, - {"bootstrap Services", bootstrapServices}, + {Name: "bootstrap loadImages", Func: sysinit.LoadBootstrapImages}, + {Name: "bootstrap Services", Func: bootstrapServices}, }) return err } diff --git a/pkg/init/cloudinit/cloudinit.go b/pkg/init/cloudinit/cloudinit.go index b27aa4cf..89f8a51d 100644 --- a/pkg/init/cloudinit/cloudinit.go +++ b/pkg/init/cloudinit/cloudinit.go @@ -113,8 +113,8 @@ func runCloudInitServices(cfg *config.CloudConfig) error { _, err = config.ChainCfgFuncs(cfg, []config.CfgFuncData{ - {"cloudinit loadImages", sysinit.LoadBootstrapImages}, - {"cloudinit Services", runCloudInitServiceSet}, + {Name: "cloudinit loadImages", Func: sysinit.LoadBootstrapImages}, + {Name: "cloudinit Services", Func: runCloudInitServiceSet}, }) return err } diff --git a/pkg/init/recovery/recovery.go b/pkg/init/recovery/recovery.go index 2bb34286..db8913a4 100644 --- a/pkg/init/recovery/recovery.go +++ b/pkg/init/recovery/recovery.go @@ -89,8 +89,8 @@ func Recovery(initFailure error) { _, err = config.ChainCfgFuncs(&recoveryConfig, []config.CfgFuncData{ - {"loadSystemImages", sysinit.LoadBootstrapImages}, - {"recovery console", recoveryServices}, + {Name: "loadSystemImages", Func: sysinit.LoadBootstrapImages}, + {Name: "recovery console", Func: recoveryServices}, }) if err != nil { log.Fatal(err) diff --git a/pkg/netconf/ipv4ll_linux.go b/pkg/netconf/ipv4ll_linux.go index 36102ed5..ef719063 100644 --- a/pkg/netconf/ipv4ll_linux.go +++ b/pkg/netconf/ipv4ll_linux.go @@ -92,7 +92,7 @@ func getPseudoRandomGenerator(haAddr []byte) (*rand.Source, error) { func getLinkAddrs(link netlink.Link) ([]netlink.Addr, error) { addrs, err := netlink.AddrList(link, nl.FAMILY_ALL) if err != nil { - log.Error("Error fetching existing ip on interface, %s", err) + log.Errorf("Error fetching existing ip on interface, %s", err) err = nil // atm, we ignore this, as the link may not have one? } return addrs, err diff --git a/pkg/sysinit/sysinit.go b/pkg/sysinit/sysinit.go index 026d9235..e91a1318 100644 --- a/pkg/sysinit/sysinit.go +++ b/pkg/sysinit/sysinit.go @@ -101,8 +101,8 @@ func SysInit() error { _, err := config.ChainCfgFuncs(cfg, config.CfgFuncs{ - {"loadSystemImages", LoadSystemImages}, - {"start project", func(cfg *config.CloudConfig) (*config.CloudConfig, error) { + {Name: "loadSystemImages", Func: LoadSystemImages}, + {Name: "start project", Func: func(cfg *config.CloudConfig) (*config.CloudConfig, error) { p, err := compose.GetProject(cfg, false, true) if err != nil { return cfg, err @@ -114,11 +114,11 @@ func SysInit() error { Log: cfg.Rancher.Log, }) }}, - {"sync", func(cfg *config.CloudConfig) (*config.CloudConfig, error) { + {Name: "sync", Func: func(cfg *config.CloudConfig) (*config.CloudConfig, error) { syscall.Sync() return cfg, nil }}, - {"banner", func(cfg *config.CloudConfig) (*config.CloudConfig, error) { + {Name: "banner", Func: func(cfg *config.CloudConfig) (*config.CloudConfig, error) { log.Infof("BurmillaOS %s started", config.Version) return cfg, nil }}})