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

use new os-base with dhcpcd

Browse Source
This commit is contained in:
wlan0 2015-03-31 14:28:14 -07:00 committed by Darren Shepherd
parent d67aec9122
commit 7cc2eb316c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/network/network.go
View File

@ -116,7 +116,7 @@ func ApplyNetworkConfigs(netCfg *config.NetworkConfig) error {
func applyNetConf(link netlink.Link, netConf config.InterfaceConfig) error { func applyNetConf(link netlink.Link, netConf config.InterfaceConfig) error {
if netConf.DHCP { if netConf.DHCP {
log.Infof("Running DHCP on %s", link.Attrs().Name) log.Infof("Running DHCP on %s", link.Attrs().Name)
cmd := exec.Command("udhcpc", "-i", link.Attrs().Name, "-t", "20", "-n") cmd := exec.Command("dhcpcd", link.Attrs().Name)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {

4
config/default.go
View File

@ -211,9 +211,7 @@ func NewConfig() *Config {
}, },
"network": { "network": {
Image: "network", Image: "network",
CapAdd: []string{ Privileged: true,
"NET_ADMIN",
},
Net: "host", Net: "host",
Labels: []string{ Labels: []string{
DETACH + "=false", DETACH + "=false",