From 19fc67b49b95b888d1ac2268624e8a82a33ef541 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Sat, 10 Dec 2016 16:20:12 +1000 Subject: [PATCH] Merge pull request #1458 from joshwget/only-set-non-empty-password Only set rancher password if non-empty (cherry picked from commit b2059859dfbd6e2e86853cc9c0aee0cb475da87b) Signed-off-by: Sven Dowideit --- cmd/console/console.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/console/console.go b/cmd/console/console.go index c8547286..14d7edbd 100644 --- a/cmd/console/console.go +++ b/cmd/console/console.go @@ -51,15 +51,17 @@ func Main() { } 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 { @@ -93,7 +95,7 @@ func Main() { } } - 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) }