From 637b1bdb3f2c2b8b1bb725324bda334744efe7b8 Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Fri, 13 Jul 2018 10:39:11 +0100
Subject: [PATCH] pkg/kmsg: write to stderr (instead of stdout)

Part of #3111

Signed-off-by: David Scott <dave.scott@docker.com>
---
 pkg/kmsg/main.go                          | 3 ++-
 test/cases/040_packages/031_kmsg/check.sh | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/kmsg/main.go b/pkg/kmsg/main.go
index 4a8c9a76b..81a3d0b3f 100644
--- a/pkg/kmsg/main.go
+++ b/pkg/kmsg/main.go
@@ -5,6 +5,7 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
 	"time"
 
 	"github.com/euank/go-kmsg-parser/kmsgparser"
@@ -20,6 +21,6 @@ func main() {
 	kmsg := parser.Parse()
 
 	for msg := range kmsg {
-		fmt.Printf("(%d) - %s: %s", msg.SequenceNumber, msg.Timestamp.Format(time.RFC3339Nano), msg.Message)
+		fmt.Fprintf(os.Stderr, "(%d) - %s: %s", msg.SequenceNumber, msg.Timestamp.Format(time.RFC3339Nano), msg.Message)
 	}
 }
diff --git a/test/cases/040_packages/031_kmsg/check.sh b/test/cases/040_packages/031_kmsg/check.sh
index 82b24083e..584bf8ebc 100755
--- a/test/cases/040_packages/031_kmsg/check.sh
+++ b/test/cases/040_packages/031_kmsg/check.sh
@@ -2,7 +2,7 @@
 
 for i in $(seq 1 20); do
 	# Look for a common kernel log message
-	if grep "SCSI subsystem initialized" /var/log/kmsg.out.log 2>/dev/null; then
+	if grep "SCSI subsystem initialized" /var/log/kmsg.log 2>/dev/null; then
 		printf "kmsg test suite PASSED\n" > /dev/console
 		/sbin/poweroff -f
 	fi
@@ -10,6 +10,6 @@ for i in $(seq 1 20); do
 done
 
 printf "kmsg test suite FAILED\n" > /dev/console
-echo "contents of /var/log/kmsg.out.log:" > /dev/console
-cat /var/log/kmsg.out.log > /dev/console
+echo "contents of /var/log/kmsg.log:" > /dev/console
+cat /var/log/kmsg.log > /dev/console
 /sbin/poweroff -f