From 242d42fbb1a533e3eee67c324f8799a6a491cd1f Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 2 Jun 2017 14:17:29 +1000 Subject: [PATCH] remove symlink error messages on second run of entrypoint Signed-off-by: Sven Dowideit --- cmd/control/entrypoint.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/cmd/control/entrypoint.go b/cmd/control/entrypoint.go index 4d4b9083..fa23b49f 100644 --- a/cmd/control/entrypoint.go +++ b/cmd/control/entrypoint.go @@ -78,19 +78,6 @@ func writeFiles(cfg *config.CloudConfig) error { } func setupCommandSymlinks() { - for _, powerOperation := range []string{ - "/sbin/poweroff", - "/sbin/shutdown", - "/sbin/reboot", - "/sbin/halt", - "/usr/sbin/poweroff", - "/usr/sbin/shutdown", - "/usr/sbin/reboot", - "/usr/sbin/halt", - } { - os.Remove(powerOperation) - } - for _, link := range []symlink{ {config.RosBin, "/usr/bin/cloud-init-execute"}, {config.RosBin, "/usr/bin/cloud-init-save"}, @@ -99,11 +86,16 @@ func setupCommandSymlinks() { {config.RosBin, "/usr/bin/system-docker"}, {config.RosBin, "/usr/sbin/netconf"}, {config.RosBin, "/usr/sbin/wait-for-docker"}, + {config.RosBin, "/usr/sbin/poweroff"}, + {config.RosBin, "/usr/sbin/reboot"}, + {config.RosBin, "/usr/sbin/halt"}, + {config.RosBin, "/usr/sbin/shutdown"}, {config.RosBin, "/sbin/poweroff"}, {config.RosBin, "/sbin/reboot"}, {config.RosBin, "/sbin/halt"}, {config.RosBin, "/sbin/shutdown"}, } { + os.Remove(link.newname) if err := os.Symlink(link.oldname, link.newname); err != nil { log.Error(err) }