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

Merge pull request #1447 from tetatetit/serial-console-online.net-fixed

Browse Source 
Fixed serial console login did not work on Online.net and it daughter …
This commit is contained in:
Sven Dowideit 2017-06-20 10:34:26 +10:00 committed by GitHub
commit 437034cb48
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/control/console_init.go
View File

@ -164,7 +164,7 @@ func generateRespawnConf(cmdline string) string {
if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) { if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
respawnConf.WriteString(" --autologin rancher") respawnConf.WriteString(" --autologin rancher")
} }
respawnConf.WriteString(fmt.Sprintf(" 115200 %s\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"} {
@ -176,7 +176,7 @@ func generateRespawnConf(cmdline string) string {
if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) { if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
respawnConf.WriteString(" --autologin rancher") respawnConf.WriteString(" --autologin rancher")
} }
respawnConf.WriteString(fmt.Sprintf(" 115200 %s\n", tty)) respawnConf.WriteString(fmt.Sprintf(" %s\n", tty))
} }
respawnConf.WriteString("/usr/sbin/sshd -D") respawnConf.WriteString("/usr/sbin/sshd -D")