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

Specify each tty for autologin

Browse Source
This commit is contained in:
Josh Curl
2016-08-22 11:19:24 -07:00
parent 90cefae4d8
commit bbab6aa760
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/console/console.go
View File

@@ -146,16 +146,16 @@ func Main() {
} }
func generateRespawnConf(cmdline string) []byte { func generateRespawnConf(cmdline string) []byte {
autologin := strings.Contains(cmdline, "rancher.autologin")
var respawnConf bytes.Buffer var respawnConf bytes.Buffer
for i := 1; i < 7; i++ { for i := 1; i < 7; i++ {
tty := fmt.Sprintf("tty%d", i)
respawnConf.WriteString(gettyCmd) respawnConf.WriteString(gettyCmd)
if autologin { if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
respawnConf.WriteString(" --autologin rancher") respawnConf.WriteString(" --autologin rancher")
} }
respawnConf.WriteString(fmt.Sprintf(" 115200 tty%d\n", i)) respawnConf.WriteString(fmt.Sprintf(" 115200 %s\n", tty))
} }
for _, tty := range []string{"ttyS0", "ttyS1", "ttyS2", "ttyS3", "ttyAMA0"} { for _, tty := range []string{"ttyS0", "ttyS1", "ttyS2", "ttyS3", "ttyAMA0"} {
@@ -164,7 +164,7 @@ func generateRespawnConf(cmdline string) []byte {
} }
respawnConf.WriteString(gettyCmd) respawnConf.WriteString(gettyCmd)
if autologin { 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(" 115200 %s\n", tty))

2
scripts/isolinux.cfg
View File

@@ -2,4 +2,4 @@ default rancheros
label rancheros label rancheros
kernel /boot/vmlinuz kernel /boot/vmlinuz
initrd /boot/initrd initrd /boot/initrd
append quiet rancher.autologin append quiet rancher.autologin=tty1 rancher.autologin=ttyS0