rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-28 19:21:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2348 from Jason-ZW/fix-docker-machine-vmware-ssh-problem

Browse Source 
Create boot2docker directory to solved waiting for ssh problem when using docker-machine vmware related  driver
This commit is contained in:
niusmallnan 2018-05-10 10:23:16 +08:00 committed by GitHub
commit 3b4153f538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
init/init.go
View File

@ -278,6 +278,13 @@ func RunInit() error {
return cfg, nil return cfg, nil
}}, }},
config.CfgFuncData{"b2d env", func(cfg *config.CloudConfig) (*config.CloudConfig, error) { config.CfgFuncData{"b2d env", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
if _, err := os.Stat("/var/lib/boot2docker"); os.IsNotExist(err) {
err := os.Mkdir("/var/lib/boot2docker", 0755)
if err != nil {
log.Errorf("Failed to create boot2docker directory: %v", err)
}
}
if dev := util.ResolveDevice("LABEL=B2D_STATE"); dev != "" { if dev := util.ResolveDevice("LABEL=B2D_STATE"); dev != "" {
boot2DockerEnvironment = true boot2DockerEnvironment = true
cfg.Rancher.State.Dev = "LABEL=B2D_STATE" cfg.Rancher.State.Dev = "LABEL=B2D_STATE"

1
os-config.tpl.yml
View File

@ -121,6 +121,7 @@ rancher:
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /run:/run - /run:/run
- /usr/share/ros:/usr/share/ros - /usr/share/ros:/usr/share/ros
- /var/lib/boot2docker:/var/lib/boot2docker
- /var/lib/rancher/cache:/var/lib/rancher/cache - /var/lib/rancher/cache:/var/lib/rancher/cache
- /var/lib/rancher/conf:/var/lib/rancher/conf - /var/lib/rancher/conf:/var/lib/rancher/conf
- /var/lib/rancher:/var/lib/rancher - /var/lib/rancher:/var/lib/rancher