rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-14 13:03:22 +00:00
Code Issues Releases Wiki Activity

Option to ignore rancher.password

Browse Source
This commit is contained in:
Jason-ZW 2018-08-22 12:45:05 +08:00 committed by niusmallnan
parent 038bb6d89b
commit 6a676a9b82
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/control/console_init.go
View File

@ -67,8 +67,16 @@ func consoleInitFunc() error {
createHomeDir(rancherHome, 1100, 1100) createHomeDir(rancherHome, 1100, 1100)
createHomeDir(dockerHome, 1101, 1101) createHomeDir(dockerHome, 1101, 1101)
ignorePassword := false
for _, d := range cfg.Rancher.Disable {
if d == "password" {
ignorePassword = true
break
}
}
password := cmdline.GetCmdline("rancher.password") password := cmdline.GetCmdline("rancher.password")
if password != "" { if !ignorePassword && 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 {
@ -221,10 +229,10 @@ func generateRespawnConf(cmdline, user string, sshd, recovery bool) string {
config := config.LoadConfig() config := config.LoadConfig()
autoLogin := true allowAutoLogin := true
for _, d := range config.Rancher.Disable { for _, d := range config.Rancher.Disable {
if d == "autologin" { if d == "autologin" {
autoLogin = false allowAutoLogin = false
break break
} }
} }
@ -233,20 +241,19 @@ func generateRespawnConf(cmdline, user string, sshd, recovery bool) string {
tty := fmt.Sprintf("tty%d", i) tty := fmt.Sprintf("tty%d", i)
respawnConf.WriteString(gettyCmd) respawnConf.WriteString(gettyCmd)
if autoLogin && strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) { if allowAutoLogin && strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
respawnConf.WriteString(fmt.Sprintf(" -n -l %s -o %s:tty%d", autologinBin, user, i)) respawnConf.WriteString(fmt.Sprintf(" -n -l %s -o %s:tty%d", autologinBin, user, i))
} }
respawnConf.WriteString(fmt.Sprintf(" --noclear %s linux\n", tty)) respawnConf.WriteString(fmt.Sprintf(" --noclear %s linux\n", tty))
} }
for _, tty := range []string{"ttyS0", "ttyS1", "ttyS2", "ttyS3", "ttyAMA0"} { for _, tty := range []string{"ttyS0", "ttyS1", "ttyS2", "ttyS3", "ttyAMA0"} {
log.Infof("console.......... %s", cmdline)
if !strings.Contains(cmdline, fmt.Sprintf("console=%s", tty)) { if !strings.Contains(cmdline, fmt.Sprintf("console=%s", tty)) {
continue continue
} }
respawnConf.WriteString(gettyCmd) respawnConf.WriteString(gettyCmd)
if autoLogin && strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) { if allowAutoLogin && strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
respawnConf.WriteString(fmt.Sprintf(" -n -l %s -o %s:%s", autologinBin, user, tty)) respawnConf.WriteString(fmt.Sprintf(" -n -l %s -o %s:%s", autologinBin, user, tty))
} }
respawnConf.WriteString(fmt.Sprintf(" %s\n", tty)) respawnConf.WriteString(fmt.Sprintf(" %s\n", tty))