commit f80fbdb15330f694e4f80992470605d46b998efd
author Alexander Filippov <a.filippov@yadro.com> Mon Jun 10 18:44:59 2019 +0300
committer Brad Bishop <radsquirrel@gmail.com> Wed Jun 19 20:21:19 2019 +0000
tree 6fc167f0f901a24e0297664fd9f23efea1f05014
parent 047f00ebe96fcb63358c550b53768513f9d835ee

meta-openpower: fix logging in first-boot-set-*

Makes the showing of the warnings  in the first-boot-set-mac.sh and
first-boot-set-hostname.sh are same

If the script runs manually the warning messages are shown on STDERR.
If the script runs as a systemd unit the warning messages  are shown in
a system journal.

Change-Id: Ic7211931844f950b822d656b1217add90dbbbb3b
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>

recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh

diff --git a/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh b/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh
index 5415237..cf67f8b 100644
--- a/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh
+++ b/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh
@@ -1,7 +1,11 @@
 #!/bin/sh -eu
 
 show_error() {
-    echo "$@" >&2
+    if [ -n "${JOURNAL_STREAM-}" ]; then
+        echo "$@" | systemd-cat -t first-boot-set-hostname -p emerg
+    else
+        echo "$@" >&2
+    fi
 }
 
 sync_hostname() {
@@ -26,7 +30,7 @@
                                 ${BMC_ITEM_PATH} 2>/dev/null || true)
 
     if [[ -z "${BMC_ITEM_SERVICE}" ]]; then
-        echo "No BMC item found in the Inventory. Is VPD EEPROM empty?" >&2
+        show_error "No BMC item found in the Inventory. Is VPD EEPROM empty?"
         return
     fi
 
@@ -43,4 +47,3 @@
 [ "$(hostname)" = "{MACHINE}" ] && sync_hostname
 
 systemctl disable first-boot-set-hostname.service
-

recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh

diff --git a/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh b/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
index 9f751a6..9668ed5 100755
--- a/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
+++ b/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
@@ -1,7 +1,11 @@
 #!/bin/sh -eu
 
 show_error() {
-    logger -p user.error -t bmc-first-init $@
+    if [ -n "${JOURNAL_STREAM-}" ]; then
+        echo "$@" | systemd-cat -t first-boot-set-mac -p emerg
+    else
+        echo "$@" >&2
+    fi
 }
 
 sync_mac() {
@@ -47,8 +51,8 @@
     fi
 }
 
-if [ $# -eq 0 ]
-    then echo 'No Ethernet interface name is given'
+if [ $# -eq 0 ]; then
+    show_error 'No Ethernet interface name is given'
     exit 1
 fi