rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-07 03:48:38 +00:00
Code Issues Releases Wiki Activity

Remove system-docker syslink

Browse Source
This commit is contained in:
niusmallnan 2018-02-27 17:52:24 +08:00 committed by niusmallnan
parent 48e9314d0c
commit a7ba5d045b
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/control/entrypoint.go
View File

@ -85,7 +85,6 @@ func setupCommandSymlinks() {
{config.RosBin, "/usr/bin/cloud-init-save"}, {config.RosBin, "/usr/bin/cloud-init-save"},
{config.RosBin, "/usr/bin/dockerlaunch"}, {config.RosBin, "/usr/bin/dockerlaunch"},
{config.RosBin, "/usr/bin/respawn"}, {config.RosBin, "/usr/bin/respawn"},
{config.RosBin, "/usr/bin/system-docker"},
{config.RosBin, "/usr/sbin/netconf"}, {config.RosBin, "/usr/sbin/netconf"},
{config.RosBin, "/usr/sbin/wait-for-docker"}, {config.RosBin, "/usr/sbin/wait-for-docker"},
{config.RosBin, "/usr/sbin/poweroff"}, {config.RosBin, "/usr/sbin/poweroff"},

10
cmd/control/install.go
View File

@ -230,11 +230,11 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
} }
} }
if _, err := os.Stat("/usr/bin/system-docker"); os.IsNotExist(err) { //if _, err := os.Stat("/usr/bin/system-docker"); os.IsNotExist(err) {
if err := os.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != nil { //if err := os.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != nil {
log.Errorf("ln error %s", err) //log.Errorf("ln error %s", err)
} //}
} //}
useIso := false useIso := false
// --isoinstallerloaded is used if the ros has created the installer container from and image that was on the booted iso // --isoinstallerloaded is used if the ros has created the installer container from and image that was on the booted iso

2
main.go
View File

@ -16,7 +16,6 @@ import (
"github.com/rancher/os/cmd/power" "github.com/rancher/os/cmd/power"
"github.com/rancher/os/cmd/respawn" "github.com/rancher/os/cmd/respawn"
"github.com/rancher/os/cmd/sysinit" "github.com/rancher/os/cmd/sysinit"
"github.com/rancher/os/cmd/systemdocker"
"github.com/rancher/os/cmd/wait" "github.com/rancher/os/cmd/wait"
"github.com/rancher/os/dfs" "github.com/rancher/os/dfs"
osInit "github.com/rancher/os/init" osInit "github.com/rancher/os/init"
@ -35,7 +34,6 @@ var entrypoints = map[string]func(){
"recovery": control.AutologinMain, "recovery": control.AutologinMain,
"ros-bootstrap": control.BootstrapMain, "ros-bootstrap": control.BootstrapMain,
"ros-sysinit": sysinit.Main, "ros-sysinit": sysinit.Main,
"system-docker": systemdocker.Main,
"wait-for-docker": wait.Main, "wait-for-docker": wait.Main,
"cni-glue": glue.Main, "cni-glue": glue.Main,
"bridge": bridge.Main, "bridge": bridge.Main,