mirror of
https://github.com/rancher/os.git
synced 2025-07-03 18:16:13 +00:00
Fix more issues with state management
This commit is contained in:
parent
76e5cf8d50
commit
b0c332f510
Binary file not shown.
@ -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",
|
||||
|
@ -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,
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user