rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Fix golint errors

Browse Source
This commit is contained in:
Josh Curl
2016-11-28 00:06:00 -08:00
parent fa1dc760f2
commit a7c34b9855
35 changed files with 205 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netconf/netconf_linux.go
View File

@@ -85,8 +85,8 @@ func createSlaveInterfaces(netCfg *config.NetworkConfig) {
}
for _, vlanDef := range vlanDefs {
if _, err = NewVlan(link, vlanDef.Name, vlanDef.Id); err != nil {
log.Errorf("Failed to create vlans on device %s, id %d: %v", link.Attrs().Name, vlanDef.Id, err)
if _, err = NewVlan(link, vlanDef.Name, vlanDef.ID); err != nil {
log.Errorf("Failed to create vlans on device %s, id %d: %v", link.Attrs().Name, vlanDef.ID, err)
}
}
}
@@ -183,7 +183,7 @@ func ApplyNetworkConfigs(netCfg *config.NetworkConfig) error {
return err
}
func RunDhcp(netCfg *config.NetworkConfig, setHostname, setDns bool) error {
func RunDhcp(netCfg *config.NetworkConfig, setHostname, setDNS bool) error {
populateDefault(netCfg)
links, err := netlink.LinkList()
@@ -203,7 +203,7 @@ func RunDhcp(netCfg *config.NetworkConfig, setHostname, setDns bool) error {
for iface, args := range dhcpLinks {
wg.Add(1)
go func(iface, args string) {
runDhcp(netCfg, iface, args, setHostname, setDns)
runDhcp(netCfg, iface, args, setHostname, setDNS)
wg.Done()
}(iface, args)
}
@@ -212,7 +212,7 @@ func RunDhcp(netCfg *config.NetworkConfig, setHostname, setDns bool) error {
return err
}
func runDhcp(netCfg *config.NetworkConfig, iface string, argstr string, setHostname, setDns bool) {
func runDhcp(netCfg *config.NetworkConfig, iface string, argstr string, setHostname, setDNS bool) {
log.Infof("Running DHCP on %s", iface)
args := []string{}
if argstr != "" {
@@ -230,7 +230,7 @@ func runDhcp(netCfg *config.NetworkConfig, iface string, argstr string, setHostn
args = append(args, "-e", "force_hostname=true")
}
if !setDns {
if !setDNS {
args = append(args, "--nohook", "resolv.conf")
}
@@ -273,14 +273,14 @@ func setGateway(gateway string) error {
return nil
}
gatewayIp := net.ParseIP(gateway)
if gatewayIp == nil {
gatewayIP := net.ParseIP(gateway)
if gatewayIP == nil {
return errors.New("Invalid gateway address " + gateway)
}
route := netlink.Route{
Scope: netlink.SCOPE_UNIVERSE,
Gw: gatewayIp,
Gw: gatewayIP,
}
if err := netlink.RouteAdd(&route); err == syscall.EEXIST {