diff --git a/init/init.go b/init/init.go index 183a5487..682a3d6a 100755 --- a/init/init.go +++ b/init/init.go @@ -95,6 +95,8 @@ func sysInit(c *config.CloudConfig) (*config.CloudConfig, error) { func MainInit() { log.InitDeferedLogger() log.Infof("MainInit() start") + defer log.Infof("MainInit() finish") + if err := RunInit(); err != nil { log.Fatal(err) } @@ -414,6 +416,7 @@ func RunInit() error { return err } + log.Infof("RunInit() finished") log.SyslogReady(true) return pidOne() diff --git a/log/log.go b/log/log.go index f7310e5c..a233d03c 100755 --- a/log/log.go +++ b/log/log.go @@ -163,7 +163,7 @@ func InitDeferedLogger() { func SyslogReady(logHook bool) error { if userHook != nil { if logHook { - logrus.Infof("Starting Syslog Hook") + Infof("------------info Starting defered Syslog Hook (%s)", os.Args[0]) fmt.Fprintf(appLog.Out, "------------ Starting defered Syslog Hook (%s) ----------------\n", os.Args[0]) } else { fmt.Fprintf(appLog.Out, "------------ Starting Syslog Hook (%s) ----------------\n", os.Args[0]) diff --git a/log/showuserlog.go b/log/showuserlog.go index 2e1c6de7..a2a09e1c 100644 --- a/log/showuserlog.go +++ b/log/showuserlog.go @@ -69,6 +69,8 @@ func (hook *ShowuserlogHook) LogSystemReady() error { hook.syslogHook = h for _, entry := range hook.storedEntries { + line, _ := entry.String() + fmt.Printf("---- CATCHUP %s\n", line) hook.syslogHook.Fire(entry) } } diff --git a/scripts/global.cfg b/scripts/global.cfg index efffcbd9..8caf499c 100755 --- a/scripts/global.cfg +++ b/scripts/global.cfg @@ -1 +1,3 @@ -APPEND rancher.debug=true rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty0 console=ttyS0 console=ttyS1 printk.devkmsg=on ${APPEND} +#APPEND rancher.console=ttyS1 rancher.debug=true rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty0 console=ttyS0 console=ttyS1 printk.devkmsg=on ${APPEND} +APPEND rancher.console=ttyS1 rancher.debug=true rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty0 console=ttyS0 printk.devkmsg=on ${APPEND} + diff --git a/scripts/run b/scripts/run index 7aef592a..94b522c8 100755 --- a/scripts/run +++ b/scripts/run @@ -277,7 +277,7 @@ if [ "$GUICONSOLE" == "" ]; then if [ "$NETCONSOLE" == "1" ]; then # put ttyS1 on port 4444 DISPLAY_OPTS="${DISPLAY_OPTS} -serial tcp::4444,server" - KERNEL_ARGS="console=ttyS1 rancher.autologin=ttyS1 ${KERNEL_ARGS}" + KERNEL_ARGS="rancher.console=ttyS1 rancher.autologin=ttyS1 ${KERNEL_ARGS}" fi fi