diff options
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" |