rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-04 18:46:15 +00:00
Code Issues Releases Wiki Activity

Fix more issues with state management

Browse Source
This commit is contained in:
Darren Shepherd 2015-02-16 22:27:32 -07:00
parent 76e5cf8d50
commit b0c332f510
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/empty-hd.img.gz
View File

Binary file not shown.

4
config/default.go
View File

@ -14,7 +14,7 @@ func NewConfig() *Config {
ImagesPattern: "images*.tar", ImagesPattern: "images*.tar",
StateRequired: false, StateRequired: false,
StateDev: "LABEL=RANCHER_STATE", StateDev: "LABEL=RANCHER_STATE",
StateDevFSType: "ext4", StateDevFSType: "auto",
SysInit: "/sbin/init-sys", SysInit: "/sbin/init-sys",
SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none"}, SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none"},
UserInit: "/sbin/init-user", UserInit: "/sbin/init-user",
@ -69,7 +69,6 @@ func NewConfig() *Config {
"-d", "-d",
"--rm", "--rm",
"--privileged", "--privileged",
//"--volume", "/:/host:ro",
"--volume", "/lib/modules:/lib/modules:ro", "--volume", "/lib/modules:/lib/modules:ro",
"--volume", "/usr/bin/docker:/usr/bin/docker:ro", "--volume", "/usr/bin/docker:/usr/bin/docker:ro",
"--volume", "/init:/usr/bin/system-docker:ro", "--volume", "/init:/usr/bin/system-docker:ro",
@ -91,7 +90,6 @@ func NewConfig() *Config {
"-d", "-d",
"--rm", "--rm",
"--privileged", "--privileged",
//"--volume", "/:/host",
"--volume", "/lib/modules:/lib/modules:ro", "--volume", "/lib/modules:/lib/modules:ro",
"--volume", "/usr/bin/docker:/usr/bin/docker:ro", "--volume", "/usr/bin/docker:/usr/bin/docker:ro",
"--volume", "/init:/usr/bin/system-docker:ro", "--volume", "/init:/usr/bin/system-docker:ro",

10
sysinit/sysinit.go
View File

@ -4,6 +4,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path" "path"
"syscall"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
dockerClient "github.com/fsouza/go-dockerclient" dockerClient "github.com/fsouza/go-dockerclient"
@ -186,10 +187,11 @@ func sysInit() error {
initFuncs := []config.InitFunc{ initFuncs := []config.InitFunc{
loadImages, loadImages,
runContainers, runContainers,
//func(cfg *config.Config) error { func(cfg *config.Config) error {
// syscall.Sync() //TODO: not totally sure why we need this.
// return nil syscall.Sync()
//}, return nil
},
//launchConsole, //launchConsole,
} }