diff options
| -rw-r--r-- | meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh | 9 | ||||
| -rwxr-xr-x | meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh index 541523760..cf67f8b47 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh +++ b/meta-openpower/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 @@ sync_hostname() { ${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 @@ sync_hostname() { [ "$(hostname)" = "{MACHINE}" ] && sync_hostname systemctl disable first-boot-set-hostname.service - diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh index 9f751a6c3..9668ed5f1 100755 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh +++ b/meta-openpower/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 @@ sync_mac() { 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 |