rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-08 10:11:46 +00:00
Code Issues Releases Wiki Activity

Switch to virtio

Browse Source
This commit is contained in:
Darren Shepherd
2015-02-16 20:52:48 -07:00
parent 6928140540
commit 47a9899b89
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@@ -79,7 +79,7 @@ func NewConfig() *Config {
ImagesPath: "/", ImagesPath: "/",
ImagesPattern: "images*.tar", ImagesPattern: "images*.tar",
StateRequired: false, StateRequired: false,
StateDev: "/dev/sda", StateDev: "/dev/vda",
StateDevFSType: "ext4", StateDevFSType: "ext4",
SysInit: "/sbin/init-sys", SysInit: "/sbin/init-sys",
SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none"}, SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none"},

9
sysinit/sysinit.go
View File

@@ -4,7 +4,6 @@ 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"
@@ -187,10 +186,10 @@ 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() // syscall.Sync()
return nil // return nil
}, //},
//launchConsole, //launchConsole,
} }