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

Move in code from netconf and docker-from-scratch

Browse Source
This commit is contained in:
Josh Curl
2016-10-19 16:21:35 -07:00
parent 1f4d23bf50
commit 691f7cb42c
16 changed files with 1567 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/docker/docker/docker"
"github.com/docker/docker/pkg/reexec"
"github.com/rancher/cniglue"
"github.com/rancher/docker-from-scratch"
"github.com/rancher/os/cmd/cloudinitexecute"
"github.com/rancher/os/cmd/cloudinitsave"
"github.com/rancher/os/cmd/console"
@@ -20,6 +19,7 @@ import (
"github.com/rancher/os/cmd/systemdocker"
"github.com/rancher/os/cmd/userdocker"
"github.com/rancher/os/cmd/wait"
"github.com/rancher/os/dfs"
osInit "github.com/rancher/os/init"
)
@@ -30,7 +30,7 @@ var entrypoints = map[string]func(){
"console.sh": console.Main,
"docker": docker.Main,
"docker-init": dockerinit.Main,
"dockerlaunch": dockerlaunch.Main,
"dockerlaunch": dfs.Main,
"halt": power.Halt,
"init": osInit.MainInit,
"netconf": network.Main,