From f41bd76b33dddb1f1c1981f11a1a1d7e894190f4 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Mon, 17 Feb 2020 10:35:35 +1030 Subject: 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 Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') 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 ; " -- cgit v1.2.3