diff options
author | Andrew Jeffery <andrew@aj.id.au> | 2020-02-17 03:05:35 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-02-18 04:49:43 +0300 |
commit | f41bd76b33dddb1f1c1981f11a1a1d7e894190f4 (patch) | |
tree | 47246e4fd5049a9441c703d3da672dbf37826c41 | |
parent | 08eb0bcfc3d0ec8d988cc05cfa244b7692bb96c9 (diff) | |
download | openbmc-f41bd76b33dddb1f1c1981f11a1a1d7e894190f4.tar.xz |
meta-phosphor: Fix SYSTEMD_PAGER export
The shell used to execute the bitbake scripts doesn't support `-e` for
for the echo builtin. This triggers an error upon login:
login: root
Password:
-sh: -e: command not found
root@machine#
Split the workaround into two separate `echo` invocations.
(From meta-phosphor rev: a1759c49cbd7260c072f09adf4479fcc23a294c3)
Change-Id: I8f973f44bd6682beeabfdd5c5972a0a33ae7befd
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 4575f5bf9..8ce0acd52 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -108,7 +108,8 @@ 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 + echo "SYSTEMD_PAGER=" >> ${IMAGE_ROOTFS}${sysconfdir}/profile + echo "export SYSTEMD_PAGER" >> ${IMAGE_ROOTFS}${sysconfdir}/profile } ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; " |