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

Merge pull request #1545 from SvenDowideit/tweak-ascii-art

Browse Source 
Add Ros version and TM to banner, and move dmesg console logging into respawn
This commit is contained in:
Sven Dowideit 2017-01-24 21:34:37 +10:00 committed by GitHub
commit 65c794ea67
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/control/console_init.go
View File

@ -33,6 +33,12 @@ type symlink struct {
func consoleInitAction(c *cli.Context) error { func consoleInitAction(c *cli.Context) error {
cfg := config.LoadConfig() cfg := config.LoadConfig()
// Now that we're booted, stop writing debug messages to the console
cmd := exec.Command("sudo", "dmesg", "--console-off")
if err := cmd.Run(); err != nil {
log.Error(err)
}
if _, err := os.Stat(rancherHome); os.IsNotExist(err) { if _, err := os.Stat(rancherHome); os.IsNotExist(err) {
if err := os.MkdirAll(rancherHome, 0755); err != nil { if err := os.MkdirAll(rancherHome, 0755); err != nil {
log.Error(err) log.Error(err)
@ -96,7 +102,7 @@ func consoleInitAction(c *cli.Context) error {
// font backslashes need to be escaped for when issue is output! (but not the others..) // font backslashes need to be escaped for when issue is output! (but not the others..)
if err := ioutil.WriteFile("/etc/issue", []byte(` if err := ioutil.WriteFile("/etc/issue", []byte(`
, , ______ _ _____ _____ , , ______ _ _____ _____ TM
,------------|'------'| | ___ \\ | | / _ / ___| ,------------|'------'| | ___ \\ | | / _ / ___|
/ . '-' |- | |_/ /__ _ _ __ ___| |__ ___ _ __ | | | \\ '--. / . '-' |- | |_/ /__ _ _ __ ___| |__ ___ _ __ | | | \\ '--.
\\/| | | | // _' | '_ \\ / __| '_ \\ / _ \\ '__' | | | |'--. \\ \\/| | | | // _' | '_ \\ / __| '_ \\ / _ \\ '__' | | | |'--. \\
@ -104,12 +110,12 @@ func consoleInitAction(c *cli.Context) error {
| | | | \\_| \\_\\__,_|_| |_|\\___|_| |_|\\___|_| \\___/\\____/ | | | | \\_| \\_\\__,_|_| |_|\\___|_| |_|\\___|_| \\___/\\____/
\\___/ \\___/ \s \r \\___/ \\___/ \s \r
RancherOS \n \l RancherOS `+config.Version+` \n \l
`), 0644); err != nil { `), 0644); err != nil {
log.Error(err) log.Error(err)
} }
cmd := exec.Command("bash", "-c", `echo $(/sbin/ifconfig | grep -B1 "inet addr" |awk '{ if ( $1 == "inet" ) { print $2 } else if ( $2 == "Link" ) { printf "%s:" ,$1 } }' |awk -F: '{ print $1 ": " $3}') >> /etc/issue`) cmd = exec.Command("bash", "-c", `echo $(/sbin/ifconfig | grep -B1 "inet addr" |awk '{ if ( $1 == "inet" ) { print $2 } else if ( $2 == "Link" ) { printf "%s:" ,$1 } }' |awk -F: '{ print $1 ": " $3}') >> /etc/issue`)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Error(err) log.Error(err)
} }

2
os-config.tpl.yml
View File

@ -1,5 +1,3 @@
runcmd:
- [ sudo, dmesg, --console-off ]
rancher: rancher:
environment: environment:
VERSION: {{.VERSION}} VERSION: {{.VERSION}}