1
0
mirror of https://github.com/rancher/os.git synced 2025-09-04 08:14:21 +00:00

Use the partial cfg for the initial network

and release the network device from dhcp if we're not using it

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-03-21 10:26:52 +00:00
parent 77759afcaa
commit 59a752c306
8 changed files with 207 additions and 73 deletions

View File

@@ -13,6 +13,8 @@ import (
"syscall"
"github.com/docker/docker/pkg/mount"
"github.com/rancher/os/cmd/control"
//networkCmd "github.com/rancher/os/cmd/network"
"github.com/rancher/os/config"
"github.com/rancher/os/dfs"
"github.com/rancher/os/log"
@@ -302,6 +304,11 @@ func RunInit() error {
log.Error(err)
}
if err := control.UdevSettle(); err != nil {
log.Errorf("Failed to run udev settle: %v", err)
}
log.Debug("init: runCloudInitServices()")
if err := runCloudInitServices(cfg); err != nil {
log.Error(err)
}