Leave dhcpcd (and netconf) running in the background.

Add wait-for-network.

cmd/network/network.go

@@ -3,6 +3,7 @@ package network
 import (
 	"fmt"
 	"os"
+	"os/exec"
 
 	log "github.com/Sirupsen/logrus"
 
@@ -11,19 +12,36 @@ import (
 	"github.com/rancher/os/config"
 )
 
+const (
+	NETWORK_DONE     = "/var/run/network.done"
+	WAIT_FOR_NETWORK = "wait-for-network"
+)
+
+func sendTerm(proc string) {
+	cmd := exec.Command("killall", "-TERM", proc)
+	cmd.Stderr = os.Stderr
+	cmd.Stdout = os.Stdout
+	cmd.Run()
+}
+
 func Main() {
 	args := os.Args
 	if len(args) > 1 {
 		fmt.Println("call " + args[0] + " to load network config from cloud-config.yml")
 		return
 	}
+	os.Remove(NETWORK_DONE) // ignore error
 	cfg, err := config.LoadConfig()
 	if err != nil {
 		log.Fatal(err)
 	}
-	// Purposely ignore error
-	cloudinit.SetHostname(cfg)
+	cloudinit.SetHostname(cfg) // ignore error
 	if err := netconf.ApplyNetworkConfigs(&cfg.Rancher.Network); err != nil {
 		log.Fatal(err)
 	}
+	if _, err := os.Create(NETWORK_DONE); err != nil {
+		log.Error(err)
+	}
+	sendTerm(WAIT_FOR_NETWORK)
+	select {}
 }

cmd/waitfornetwork/waitfornetwork.go

@@ -0,0 +1,23 @@
+package waitfornetwork
+
+import (
+	"github.com/rancher/os/cmd/network"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func handleTerm() {
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, syscall.SIGTERM)
+	<-c
+	os.Exit(0)
+}
+
+func Main() {
+	go handleTerm()
+	if _, err := os.Stat(network.NETWORK_DONE); err == nil {
+		os.Exit(0)
+	}
+	select {}
+}