rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-06 09:14:31 +00:00
Code Issues Releases Wiki Activity

Console switch warning based on running console and not enabled console

Browse Source
This commit is contained in:
Josh Curl
2016-06-29 00:52:38 -07:00
parent 6b47d33df2
commit 92b24d9790
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/control/console.go
View File

@@ -52,7 +52,7 @@ func consoleSwitch(c *cli.Context) error {
newConsole := c.Args()[0] newConsole := c.Args()[0]
cfg := config.LoadConfig() cfg := config.LoadConfig()
if newConsole == cfg.Rancher.Console { if newConsole == currentConsole() {
log.Warnf("Console is already set to %s", newConsole) log.Warnf("Console is already set to %s", newConsole)
} }
@@ -127,13 +127,7 @@ func consoleList(c *cli.Context) error {
consoles = append(consoles, "default") consoles = append(consoles, "default")
sort.Strings(consoles) sort.Strings(consoles)
var currentConsole string currentConsole := currentConsole()
currentConsoleBytes, err := ioutil.ReadFile("/run/console-done")
if err == nil {
currentConsole = strings.TrimSpace(string(currentConsoleBytes))
} else {
log.Warnf("Failed to detect current console: %v", err)
}
for _, console := range consoles { for _, console := range consoles {
if console == currentConsole { if console == currentConsole {
@@ -147,3 +141,13 @@ func consoleList(c *cli.Context) error {
return nil return nil
} }
func currentConsole() (console string) {
consoleBytes, err := ioutil.ReadFile("/run/console-done")
if err == nil {
console = strings.TrimSpace(string(consoleBytes))
} else {
log.Warnf("Failed to detect current console: %v", err)
}
return
}