1
0
mirror of https://github.com/rancher/os.git synced 2025-06-30 16:51:47 +00:00

Fixed serial console login did not work on Online.net and it dougter Scaleway.com but shown garbage and broken futher output instead

This commit is contained in:
Serhiy Berezin 2016-12-02 00:40:04 +00:00
parent 2bcc69b59a
commit e43fb097c8

View File

@ -139,7 +139,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"} {
@ -151,7 +151,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")