From 2fdfd56a2ca15861b2b2c8e217d49ee4bcc68aeb Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Fri, 3 Apr 2015 15:18:40 -0700
Subject: [PATCH] Switch network container to privileged and don't use ARP

---
 cmd/network/network.go | 2 +-
 config/default.go      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/network/network.go b/cmd/network/network.go
index 14bdd9a5..9b1f7339 100644
--- a/cmd/network/network.go
+++ b/cmd/network/network.go
@@ -116,7 +116,7 @@ func ApplyNetworkConfigs(netCfg *config.NetworkConfig) error {
 func applyNetConf(link netlink.Link, netConf config.InterfaceConfig) error {
 	if netConf.DHCP {
 		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.Stderr = os.Stderr
 		if err := cmd.Run(); err != nil {
diff --git a/config/default.go b/config/default.go
index 2ff14084..c0ac67a1 100644
--- a/config/default.go
+++ b/config/default.go
@@ -210,9 +210,9 @@ func NewConfig() *Config {
 				},
 			},
 			"network": {
-				Image: "network",
+				Image:      "network",
 				Privileged: true,
-                                Net: "host",
+				Net:        "host",
 				Labels: []string{
 					DETACH + "=false",
 				},