rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-11 11:32:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1458 from joshwget/only-set-non-empty-password

Browse Source 
Only set rancher password if non-empty
(cherry picked from commit b2059859df)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2016-12-10 16:20:12 +10:00
parent d9605c5302
commit 19fc67b49b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/console/console.go
View File

@ -51,6 +51,7 @@ func Main() {
} }
password := config.GetCmdline("rancher.password") password := config.GetCmdline("rancher.password")
if password != "" {
cmd := exec.Command("chpasswd") cmd := exec.Command("chpasswd")
cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password)) cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password))
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
@ -61,6 +62,7 @@ func Main() {
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Error(err) log.Error(err)
} }
}
if err := setupSSH(cfg); err != nil { if err := setupSSH(cfg); err != nil {
log.Error(err) log.Error(err)
@ -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 { if err := cmd.Run(); err != nil {
log.Error(err) log.Error(err)
} }