diff --git a/assets/empty-hd.img.gz b/assets/empty-hd.img.gz index 7be02142..7ccbceb1 100644 Binary files a/assets/empty-hd.img.gz and b/assets/empty-hd.img.gz differ diff --git a/config/default.go b/config/default.go index 17344d95..29912e01 100644 --- a/config/default.go +++ b/config/default.go @@ -14,7 +14,7 @@ func NewConfig() *Config { ImagesPattern: "images*.tar", StateRequired: false, StateDev: "LABEL=RANCHER_STATE", - StateDevFSType: "ext4", + StateDevFSType: "auto", SysInit: "/sbin/init-sys", SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none"}, UserInit: "/sbin/init-user", @@ -69,7 +69,6 @@ func NewConfig() *Config { "-d", "--rm", "--privileged", - //"--volume", "/:/host:ro", "--volume", "/lib/modules:/lib/modules:ro", "--volume", "/usr/bin/docker:/usr/bin/docker:ro", "--volume", "/init:/usr/bin/system-docker:ro", @@ -91,7 +90,6 @@ func NewConfig() *Config { "-d", "--rm", "--privileged", - //"--volume", "/:/host", "--volume", "/lib/modules:/lib/modules:ro", "--volume", "/usr/bin/docker:/usr/bin/docker:ro", "--volume", "/init:/usr/bin/system-docker:ro", diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go index a1208040..03671877 100644 --- a/sysinit/sysinit.go +++ b/sysinit/sysinit.go @@ -4,6 +4,7 @@ import ( "os" "os/exec" "path" + "syscall" log "github.com/Sirupsen/logrus" dockerClient "github.com/fsouza/go-dockerclient" @@ -186,10 +187,11 @@ func sysInit() error { initFuncs := []config.InitFunc{ loadImages, runContainers, - //func(cfg *config.Config) error { - // syscall.Sync() - // return nil - //}, + func(cfg *config.Config) error { + //TODO: not totally sure why we need this. + syscall.Sync() + return nil + }, //launchConsole, }