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

Merge pull request #1063 from joshwget/fix-console-warning-message

Browse Source 
Console switch warning based on running console and not enabled console
This commit is contained in:
Darren Shepherd
2016-06-29 20:03:16 -07:00
committed by GitHub
parent e24cad0a5e 92b24d9790
commit e4e07ec278
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]
cfg := config.LoadConfig()
if newConsole == cfg.Rancher.Console {
if newConsole == currentConsole() {
log.Warnf("Console is already set to %s", newConsole)
}
@@ -127,13 +127,7 @@ func consoleList(c *cli.Context) error {
consoles = append(consoles, "default")
sort.Strings(consoles)
var currentConsole string
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)
}
currentConsole := currentConsole()
for _, console := range consoles {
if console == currentConsole {
@@ -147,3 +141,13 @@ func consoleList(c *cli.Context) error {
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
}