summaryrefslogtreecommitdiff
path: root/meta-phosphor
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2020-01-24 07:21:54 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2020-02-05 16:16:05 +0300
commite60ab2abf8c51428f9bd18d142d39b871056373b (patch)
tree9a4d909a87ed03050ac7f0e56bf532c442f21d38 /meta-phosphor
parentbb8adecef310a36de4775cea169c84e5a1c04f0f (diff)
downloadopenbmc-e60ab2abf8c51428f9bd18d142d39b871056373b.tar.xz
meta-phosphor: Disable use of pager for output of systemd tools
Prevent systemd from garbling its output with control characters that busybox doesn't interpret. (From meta-phosphor rev: b51d6e3322ea6cfa93e99c74663b7fb9923c2f65) Change-Id: I2dddce5bef6f41058574904193976ca74f0b0ac9 Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/classes/obmc-phosphor-image.bbclass7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index b428205ab..4575f5bf9 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -105,6 +105,13 @@ remove_etc_version() {
}
ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; "
+# Disable the pager to prevent systemd injecting control characters into the
+# output stream that are not interpreted by busybox tools.
+disable_systemd_pager() {
+ echo -e "SYSTEMD_PAGER=\nexport SYSTEMD_PAGER" >> ${IMAGE_ROOTFS}${sysconfdir}/profile
+}
+ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; "
+
# The shadow recipe provides the binaries(like useradd, usermod) needed by the
# phosphor-user-manager.
ROOTFS_RO_UNNEEDED_remove = "shadow"