1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

latest rancher-compose, default.go -> os-config.yml

also, gofmt
This commit is contained in:
Ivan Mikushin
2015-06-16 01:58:16 +05:00
parent e8aa88530f
commit dff70f8362
16 changed files with 474 additions and 420 deletions

View File

@@ -34,16 +34,16 @@ var (
"/var/lib/rancher/state/opt",
}
mounts [][]string = [][]string{
[]string{"devtmpfs", "/dev", "devtmpfs", ""},
[]string{"none", "/dev/pts", "devpts", ""},
[]string{"none", "/etc/docker", "tmpfs", ""},
[]string{"none", "/proc", "proc", ""},
[]string{"none", "/run", "tmpfs", ""},
[]string{"none", "/sys", "sysfs", ""},
[]string{"none", "/sys/fs/cgroup", "tmpfs", ""},
{"devtmpfs", "/dev", "devtmpfs", ""},
{"none", "/dev/pts", "devpts", ""},
{"none", "/etc/docker", "tmpfs", ""},
{"none", "/proc", "proc", ""},
{"none", "/run", "tmpfs", ""},
{"none", "/sys", "sysfs", ""},
{"none", "/sys/fs/cgroup", "tmpfs", ""},
}
postMounts [][]string = [][]string{
[]string{"none", "/var/run", "tmpfs", ""},
{"none", "/var/run", "tmpfs", ""},
}
cgroups []string = []string{
"blkio",
@@ -123,7 +123,7 @@ func mountCgroups(cfg *config.Config) error {
}
err = createMounts([][]string{
[]string{"none", "sys/fs/cgroup/" + cgroup, "cgroup", cgroup},
{"none", "sys/fs/cgroup/" + cgroup, "cgroup", cgroup},
}...)
if err != nil {
return err