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

Revert "Change dhcpcd master node startup function"

Browse Source 
This reverts commit b1c5892b87.
This commit is contained in:
niusmallnan 2018-11-19 11:56:12 +08:00
parent b1c5892b87
commit ec0fbd6e2c
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/netconf/netconf_linux.go
View File

@ -24,11 +24,10 @@ const (
)
var (
defaultDhcpArgs = []string{"dhcpcd", "-MA4"}
inactiveDhcpArgs = []string{"dhcpcd", "-MA4", "--inactive"}
exitDhcpArgs = []string{"dhcpcd", "-x"}
exitWpaArgs = []string{"wpa_cli", "terminate"}
dhcpReleaseCmd = "dhcpcd --release"
defaultDhcpArgs = []string{"dhcpcd", "-MA4"}
exitDhcpArgs = []string{"dhcpcd", "-x"}
exitWpaArgs = []string{"wpa_cli", "terminate"}
dhcpReleaseCmd = "dhcpcd --release"
)
func createInterfaces(netCfg *NetworkConfig) {
@ -179,12 +178,7 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig, userSetHostname, userSetDNS bool
wg := sync.WaitGroup{}
// Don't start any interfaces other than those specified on the command line.
// This allows dhcpcd to be started in Master mode.
// Then wait for subsequent dhcpcd commands to start each interface as required.
runInactiveDhcp()
// apply network config
//apply network config
for _, link := range links {
applyOuter(link, netCfg, &wg, userSetHostname, userSetDNS)
}
@ -288,15 +282,6 @@ func hasDhcp(iface string) bool {
return len(out) > 0
}
func runInactiveDhcp() {
cmd := exec.Command(inactiveDhcpArgs[0], inactiveDhcpArgs[1:]...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
log.Errorf("Failed to run command [%v]: %v", cmd, err)
}
}
func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, setDNS bool) {
args := []string{}
if argstr != "" {