rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

Only set rancher password if non-empty

Browse Source
This commit is contained in:
Josh Curl
2016-12-08 15:22:43 -08:00
parent f1f41dffa2
commit 328bd5bd2e
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") password := config.GetCmdline("rancher.password")
cmd := exec.Command("chpasswd") if password != "" {
cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password)) cmd := exec.Command("chpasswd")
if err := cmd.Run(); err != nil { cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password))
log.Error(err) if err := cmd.Run(); err != nil {
} log.Error(err)
}
cmd = exec.Command("bash", "-c", `sed -E -i 's/(rancher:.*:).*(:.*:.*:.*:.*:.*:.*)$/\1\2/' /etc/shadow`) cmd = exec.Command("bash", "-c", `sed -E -i 's/(rancher:.*:).*(:.*:.*:.*:.*:.*:.*)$/\1\2/' /etc/shadow`)
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 {
@@ -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 { if err := cmd.Run(); err != nil {
log.Error(err) log.Error(err)
} }