Option to disable login prompt

rancher · Aug 22, 2018 · 038bb6d · 038bb6d
1 parent 909859c
commit 038bb6d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/cmd/control/console_init.go b/cmd/control/console_init.go
@@ -219,23 +219,34 @@ func generateRespawnConf(cmdline, user string, sshd, recovery bool) string {
 		autologinBin = "/usr/bin/recovery"
 	}
 
+	config := config.LoadConfig()
+
+	autoLogin := true
+	for _, d := range config.Rancher.Disable {
+		if d == "autologin" {
+			autoLogin = false
+			break
+		}
+	}
+
 	for i := 1; i < 7; i++ {
 		tty := fmt.Sprintf("tty%d", i)
 
 		respawnConf.WriteString(gettyCmd)
-		if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
+		if autoLogin && 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(" --noclear %s linux\n", tty))
 	}
 
 	for _, tty := range []string{"ttyS0", "ttyS1", "ttyS2", "ttyS3", "ttyAMA0"} {
+		log.Infof("console.......... %s", cmdline)
 		if !strings.Contains(cmdline, fmt.Sprintf("console=%s", tty)) {
 			continue
 		}
 
 		respawnConf.WriteString(gettyCmd)
-		if strings.Contains(cmdline, fmt.Sprintf("rancher.autologin=%s", tty)) {
+		if autoLogin && 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(" %s\n", tty))