From 75193251620cbae79145ca06e71aa937d89bb40e Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Fri, 16 Dec 2016 00:16:19 +1000
Subject: [PATCH] try to simplify logging

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 log/log.go          | 33 ++++++++++++++++++---------------
 scripts/package-iso |  1 -
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/log/log.go b/log/log.go
index 04c0a2d0..92603c9e 100644
--- a/log/log.go
+++ b/log/log.go
@@ -109,29 +109,32 @@ func InitLogger() {
 	}
 	thisLog := logrus.New()
 
-	filename := "/dev/kmsg"
-	f, err := os.OpenFile(filename, os.O_WRONLY, 0644)
-	if err != nil {
-		logrus.Debugf("error opening /dev/kmsg %s", err)
-	}
-
 	// Filter what the user sees (info level, unless they set --debug)
 	stdLogger := logrus.StandardLogger()
 	showuserHook, err := NewShowuserlogHook(stdLogger.Level)
 	if err != nil {
-		f.Close()
 		logrus.Errorf("hook failure %s", err)
+		return
 	}
 
-	// We're all set up, now we can make it global
-	appLog = thisLog
-	userHook = showuserHook
+	// TODO: look into containerized syslog
+	//filename := "/dev/kmsg"
+	filename := "/var/log/log"
+	f, err := os.OpenFile(filename, os.O_WRONLY, 0644)
+	if err != nil {
+		logrus.Debugf("error opening %s: %s", filename, err)
+	} else {
+		// We're all set up, now we can make it global
+		appLog = thisLog
+		userHook = showuserHook
 
-	thisLog.Hooks.Add(showuserHook)
-	logrus.StandardLogger().Hooks.Add(showuserHook)
-	thisLog.Out = f
-	logrus.SetOutput(f)
-	thisLog.Level = logrus.DebugLevel
+		thisLog.Hooks.Add(showuserHook)
+		logrus.StandardLogger().Hooks.Add(showuserHook)
+
+		thisLog.Out = f
+		logrus.SetOutput(f)
+		thisLog.Level = logrus.DebugLevel
+	}
 
 	pwd, err := os.Getwd()
 	if err != nil {
diff --git a/scripts/package-iso b/scripts/package-iso
index 0b1e9161..8da9d1be 100755
--- a/scripts/package-iso
+++ b/scripts/package-iso
@@ -35,7 +35,6 @@ cp /usr/lib/ISOLINUX/isolinux.bin             ${CD}/boot/isolinux/
 cp /usr/lib/syslinux/modules/bios/ldlinux.c32 ${CD}/boot/isolinux/
 # add the installer image to the iso for non-network / dev/test
 cp ${ARTIFACTS}/installer.tar                 ${CD}/rancheros/
-cp assets/bootinfoscript                      ${CD}/rancheros/
 gzip ${CD}/rancheros/installer.tar
 cd ${CD} && xorriso \
     -as mkisofs \