From 1a6cee5305c920cdbdd3fab46725ed5ac4549457 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 30 Oct 2014 17:29:02 -0700 Subject: [PATCH] networkd: remove double-restart workaround The kernel fixed the underlying issue in 763e0ec and e721f87. --- system/networkd.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/system/networkd.go b/system/networkd.go index 0055a5b..528aaa2 100644 --- a/system/networkd.go +++ b/system/networkd.go @@ -22,11 +22,11 @@ import ( "net" "os/exec" "strings" - "time" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink" "github.com/coreos/coreos-cloudinit/config" "github.com/coreos/coreos-cloudinit/network" + + "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink" ) const ( @@ -35,13 +35,6 @@ const ( func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { defer func() { - if e := restartNetworkd(); e != nil { - err = e - return - } - // TODO(crawford): Get rid of this once networkd fixes the race - // https://bugs.freedesktop.org/show_bug.cgi?id=76077 - time.Sleep(5 * time.Second) if e := restartNetworkd(); e != nil { err = e }