summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd_244.5.bb
diff options
context:
space:
mode:
authorAlban Bedel <alban.bedel@aerq.com>2023-03-16 13:51:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-25 23:00:59 +0000
commit97b1bdd293ada9b36d0e9407bd98f3194abac693 (patch)
treea7318356e75180138a3138587d3cf25080d63a21 /meta/recipes-core/systemd/systemd_244.5.bb
parentbe80f805d4550621da85b1869b1561d2d20a1fc8 (diff)
downloadpoky-97b1bdd293ada9b36d0e9407bd98f3194abac693.tar.gz
systemd: Fix systemd when used with busybox less
Per default systemd use a pager for the output of most of its tools and it expect this pager to be color capable. But that is not the case when the busybox `less` is used, which lead to output garbled by color escape sequences. To fix this issue add a profile frament that disable the systemd pager when busybox `less` is detected. (From OE-Core rev: 06271fd8d26bc34448524157077c23eb1ea29c52) Signed-off-by: Alban Bedel <alban.bedel@aerq.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit de7e36a7858ebca4615975967fcad1c399eacdb0) Signed-off-by: Jermain Horsman <jermain.horsman@nedap.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_244.5.bb')
-rw-r--r--meta/recipes-core/systemd/systemd_244.5.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_244.5.bb b/meta/recipes-core/systemd/systemd_244.5.bb
index 2bca1fbc82..98a580e2ea 100644
--- a/meta/recipes-core/systemd/systemd_244.5.bb
+++ b/meta/recipes-core/systemd/systemd_244.5.bb
@@ -18,6 +18,7 @@ SRC_URI += "file://touchscreen.rules \
18 file://00-create-volatile.conf \ 18 file://00-create-volatile.conf \
19 file://init \ 19 file://init \
20 file://99-default.preset \ 20 file://99-default.preset \
21 file://systemd-pager.sh \
21 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ 22 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
22 file://0003-implment-systemd-sysv-install-for-OE.patch \ 23 file://0003-implment-systemd-sysv-install-for-OE.patch \
23 file://CVE-2021-33910.patch \ 24 file://CVE-2021-33910.patch \
@@ -317,6 +318,9 @@ do_install() {
317 # install default policy for presets 318 # install default policy for presets
318 # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto 319 # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
319 install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset 320 install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset
321
322 # add a profile fragment to disable systemd pager with busybox less
323 install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh
320} 324}
321 325
322python populate_packages_prepend (){ 326python populate_packages_prepend (){
@@ -539,6 +543,7 @@ FILES_${PN} = " ${base_bindir}/* \
539 ${sysconfdir}/dbus-1/ \ 543 ${sysconfdir}/dbus-1/ \
540 ${sysconfdir}/modules-load.d/ \ 544 ${sysconfdir}/modules-load.d/ \
541 ${sysconfdir}/pam.d/ \ 545 ${sysconfdir}/pam.d/ \
546 ${sysconfdir}/profile.d/ \
542 ${sysconfdir}/sysctl.d/ \ 547 ${sysconfdir}/sysctl.d/ \
543 ${sysconfdir}/systemd/ \ 548 ${sysconfdir}/systemd/ \
544 ${sysconfdir}/tmpfiles.d/ \ 549 ${sysconfdir}/tmpfiles.d/ \