rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

update to docker-1.9.1 and docker-from-scratch-1.9.1

Browse Source
This commit is contained in:
Ivan Mikushin
2015-12-02 15:03:50 +05:00
parent 110ccd9f49
commit 887af95d8f
29 changed files with 34 additions and 3646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.go
View File

@@ -6,7 +6,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
dockerlaunchMain "github.com/rancher/docker-from-scratch/main"
"github.com/rancher/docker-from-scratch"
"github.com/rancher/os/cmd/cloudinit"
"github.com/rancher/os/cmd/control"
"github.com/rancher/os/cmd/network"
@@ -42,7 +42,7 @@ func registerCmd(cmd string, mainFunc func()) {
func main() {
registerCmd("/init", osInit.MainInit)
registerCmd(config.SYSINIT_BIN, sysinit.Main)
registerCmd("/usr/bin/dockerlaunch", dockerlaunchMain.Main)
registerCmd("/usr/bin/dockerlaunch", dockerlaunch.Main)
registerCmd("/usr/bin/user-docker", userdocker.Main)
registerCmd("/usr/bin/system-docker", systemdocker.Main)
registerCmd("/sbin/poweroff", power.PowerOff)