rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-01 17:21:50 +00:00
Code Issues Releases Wiki Activity

Switch network container to privileged and don't use ARP

Browse Source
This commit is contained in:
Darren Shepherd 2015-04-03 15:18:40 -07:00
parent 7cc2eb316c
commit 2fdfd56a2c
2 changed files with 3 additions and 3 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("dhcpcd", link.Attrs().Name) cmd := exec.Command("dhcpcd", "-A4", 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

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