Replace wait-for-network services with retries

cmd/network/network.go

@@ -3,44 +3,50 @@ package network
 import (
 	"flag"
 	"os"
-	"os/exec"
+
+	"golang.org/x/net/context"
 
 	log "github.com/Sirupsen/logrus"
 
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/rancher/netconf"
 	"github.com/rancher/os/config"
+	"github.com/rancher/os/docker"
 	"github.com/rancher/os/hostname"
 )
 
-const (
-	NETWORK_DONE     = "/var/run/network.done"
-	WAIT_FOR_NETWORK = "wait-for-network"
-)
-
 var (
-	daemon bool
-	flags  *flag.FlagSet
+	stopNetworkPre bool
+	flags          *flag.FlagSet
 )
 
 func init() {
 	flags = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
-	flags.BoolVar(&daemon, "daemon", false, "run dhcpd as daemon")
-}
-
-func sendTerm(proc string) {
-	cmd := exec.Command("killall", "-TERM", proc)
-	cmd.Stderr = os.Stderr
-	cmd.Stdout = os.Stdout
-	cmd.Run()
+	flags.BoolVar(&stopNetworkPre, "stop-network-pre", false, "")
 }
 
 func Main() {
 	flags.Parse(os.Args[1:])
 
-	log.Infof("Running network: daemon=%v", daemon)
+	log.Infof("Running network: stop-network-pre=%v", stopNetworkPre)
+
+	if stopNetworkPre {
+		client, err := docker.NewSystemClient()
+		if err != nil {
+			log.Error(err)
+		}
+
+		err = client.ContainerStop(context.Background(), "network-pre", 10)
+		if err != nil {
+			log.Error(err)
+		}
+
+		_, err = client.ContainerWait(context.Background(), "network-pre")
+		if err != nil {
+			log.Error(err)
+		}
+	}
 
-	os.Remove(NETWORK_DONE) // ignore error
 	cfg, err := config.LoadConfig()
 	if err != nil {
 		log.Fatal(err)
@@ -75,14 +81,5 @@ func Main() {
 		log.Error(err)
 	}
 
-	if f, err := os.Create(NETWORK_DONE); err != nil {
-		log.Error(err)
-	} else {
-		f.Close()
-	}
-	sendTerm(WAIT_FOR_NETWORK)
-
-	if daemon {
-		select {}
-	}
+	select {}
 }