From 328bd5bd2e201207e361b422346388fe29bd09de Mon Sep 17 00:00:00 2001 From: Josh Curl Date: Thu, 8 Dec 2016 15:22:43 -0800 Subject: [PATCH] Only set rancher password if non-empty --- cmd/control/console_init.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/control/console_init.go b/cmd/control/console_init.go index 759527e3..82e48160 100644 --- a/cmd/control/console_init.go +++ b/cmd/control/console_init.go @@ -52,15 +52,17 @@ func consoleInitAction(c *cli.Context) error { } password := config.GetCmdline("rancher.password") - cmd := exec.Command("chpasswd") - cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password)) - if err := cmd.Run(); err != nil { - log.Error(err) - } + if password != "" { + cmd := exec.Command("chpasswd") + cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password)) + if err := cmd.Run(); err != nil { + log.Error(err) + } - cmd = exec.Command("bash", "-c", `sed -E -i 's/(rancher:.*:).*(:.*:.*:.*:.*:.*:.*)$/\1\2/' /etc/shadow`) - if err := cmd.Run(); err != nil { - log.Error(err) + cmd = exec.Command("bash", "-c", `sed -E -i 's/(rancher:.*:).*(:.*:.*:.*:.*:.*:.*)$/\1\2/' /etc/shadow`) + if err := cmd.Run(); err != nil { + log.Error(err) + } } if err := setupSSH(cfg); err != nil { @@ -92,7 +94,7 @@ func consoleInitAction(c *cli.Context) error { } } - cmd = exec.Command("bash", "-c", `echo 'RancherOS \n \l' > /etc/issue`) + cmd := exec.Command("bash", "-c", `echo 'RancherOS \n \l' > /etc/issue`) if err := cmd.Run(); err != nil { log.Error(err) }