diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2020-12-17 22:48:01 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2021-01-05 18:53:17 +0300 |
| commit | 243727266268aee6b5217d992b0dee9e232471ec (patch) | |
| tree | ecab91d350f6a0e1a5a2a47501ba2c3af9a87949 | |
| parent | cf61a68053da9531100618eb06a0ba5d016238a2 (diff) | |
| download | openbmc-243727266268aee6b5217d992b0dee9e232471ec.tar.xz | |
systemd: remove SYSTEMD_PAGER= profile settings
There was support to inject an empty "SYSTEMD_PAGER=" variable
into the profile. This was to workaround ANSI control characters
being injected into the default systemd tool output, but has a
side-effect of disabling the pager for useful commands like
`journalctl`.
The underlying cause of these control characters was that busybox less
was missing features that systemd relies on. Many of these busybox
features say "this is essential for less applet to work with ...
systemd": https://git.busybox.net/busybox/tree/miscutils/less.c#n103
These are now enabled so this empty environment variable can be removed.
(From meta-phosphor rev: d8f8d70f7e4771eb295fff3ca80182b6636411b6)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idc2fef9ccfb28e7956caf4efc141698940879f65
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
3 files changed, 0 insertions, 13 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index b2d3b5ef3..da8c337f1 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -86,11 +86,6 @@ remove_etc_version() { rm ${IMAGE_ROOTFS}${sysconfdir}/version } -disable_systemd_pager() { - echo "SYSTEMD_PAGER=" >> ${IMAGE_ROOTFS}${sysconfdir}/profile - echo "export SYSTEMD_PAGER" >> ${IMAGE_ROOTFS}${sysconfdir}/profile -} - enable_ldap_nsswitch() { sed -i 's/\(\(passwd\|group\|shadow\):\s*\).*/\1files ldap/' \ "${IMAGE_ROOTFS}${sysconfdir}/nsswitch.conf" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb index 2d9137705..38b1c2d42 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb @@ -8,7 +8,3 @@ inherit obmc-phosphor-image # The /etc/version file is misleading and not useful. Remove it. # Users should instead rely on /etc/os-release. 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. -ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; " diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 63908a145..76515fae0 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -48,10 +48,6 @@ inherit obmc-phosphor-image # Users should instead rely on /etc/os-release. 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. -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" |