From a7ba5d045b4f05bc346883dfec691842ce84de88 Mon Sep 17 00:00:00 2001
From: niusmallnan <niusmallnan@gmail.com>
Date: Tue, 27 Feb 2018 17:52:24 +0800
Subject: [PATCH] Remove system-docker syslink

---
 cmd/control/entrypoint.go |  1 -
 cmd/control/install.go    | 10 +++++-----
 main.go                   |  2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/cmd/control/entrypoint.go b/cmd/control/entrypoint.go
index 5f700661..b7219e08 100644
--- a/cmd/control/entrypoint.go
+++ b/cmd/control/entrypoint.go
@@ -85,7 +85,6 @@ func setupCommandSymlinks() {
 		{config.RosBin, "/usr/bin/cloud-init-save"},
 		{config.RosBin, "/usr/bin/dockerlaunch"},
 		{config.RosBin, "/usr/bin/respawn"},
-		{config.RosBin, "/usr/bin/system-docker"},
 		{config.RosBin, "/usr/sbin/netconf"},
 		{config.RosBin, "/usr/sbin/wait-for-docker"},
 		{config.RosBin, "/usr/sbin/poweroff"},
diff --git a/cmd/control/install.go b/cmd/control/install.go
index 433077d3..874bd87d 100755
--- a/cmd/control/install.go
+++ b/cmd/control/install.go
@@ -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.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != nil {
-			log.Errorf("ln error %s", 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 {
+	//log.Errorf("ln error %s", err)
+	//}
+	//}
 
 	useIso := false
 	// --isoinstallerloaded is used if the ros has created the installer container from and image that was on the booted iso
diff --git a/main.go b/main.go
index 4224a43e..bb6496d9 100644
--- a/main.go
+++ b/main.go
@@ -16,7 +16,6 @@ import (
 	"github.com/rancher/os/cmd/power"
 	"github.com/rancher/os/cmd/respawn"
 	"github.com/rancher/os/cmd/sysinit"
-	"github.com/rancher/os/cmd/systemdocker"
 	"github.com/rancher/os/cmd/wait"
 	"github.com/rancher/os/dfs"
 	osInit "github.com/rancher/os/init"
@@ -35,7 +34,6 @@ var entrypoints = map[string]func(){
 	"recovery":           control.AutologinMain,
 	"ros-bootstrap":      control.BootstrapMain,
 	"ros-sysinit":        sysinit.Main,
-	"system-docker":      systemdocker.Main,
 	"wait-for-docker":    wait.Main,
 	"cni-glue":           glue.Main,
 	"bridge":             bridge.Main,