rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-19 17:38:30 +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
This commit is contained in:
Sven Dowideit
2016-12-10 16:20:12 +10:00
committed by GitHub
parent ff1ab8cfe9 328bd5bd2e
commit b2059859df
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/control/console_init.go
View File

@@ -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)
}