diff --git a/meta-balena-dunfell/recipes-core/systemd/systemd/0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch b/meta-balena-dunfell/recipes-core/systemd/systemd/0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch deleted file mode 100644 index 37c6527d5e..0000000000 --- a/meta-balena-dunfell/recipes-core/systemd/systemd/0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0a202ff280f044860f6027c35df096435e511604 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Mon, 31 Dec 2018 14:39:56 +0000 -Subject: [PATCH] core: Don't redirect stdio to null when running in container - -Upstream-status: Rejected [https://github.com/systemd/systemd/pull/8220] -Signed-off-by: Andrei Gherzan - ---- - src/core/main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core/main.c b/src/core/main.c -index c24b696b16..b076d83fd0 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -2534,7 +2534,8 @@ int main(int argc, char *argv[]) { - * they never log into the console. */ - log_show_color(colors_enabled()); - -- r = make_null_stdio(); -+ if (detect_container() <= 0) -+ r = make_null_stdio(); - if (r < 0) - log_warning_errno(r, "Failed to redirect standard streams to /dev/null, ignoring: %m"); - } diff --git a/meta-balena-dunfell/recipes-core/systemd/systemd_%.bbappend b/meta-balena-dunfell/recipes-core/systemd/systemd_%.bbappend index a69fa53c5e..278040955d 100644 --- a/meta-balena-dunfell/recipes-core/systemd/systemd_%.bbappend +++ b/meta-balena-dunfell/recipes-core/systemd/systemd_%.bbappend @@ -1,9 +1,3 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -SRC_URI_append = " \ - file://0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch \ - " - PACKAGECONFIG_remove = "nss-resolve" do_install_append() { diff --git a/meta-balena-honister/recipes-core/systemd/systemd/0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch b/meta-balena-honister/recipes-core/systemd/systemd/0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch deleted file mode 100644 index a84c3bfbbe..0000000000 --- a/meta-balena-honister/recipes-core/systemd/systemd/0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5e06792ded468da3ca54e97040548d64fb4a32d2 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Wed, 27 Oct 2021 17:18:57 +0200 -Subject: [PATCH] core: Don't redirect stdio to null when running in container - -Upstream-status: Rejected [https://github.com/systemd/systemd/pull/8220] -Signed-off-by: Andrei Gherzan ---- - src/core/main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core/main.c b/src/core/main.c -index b32a19a1d8..072f803e03 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -2745,7 +2745,8 @@ int main(int argc, char *argv[]) { - * they never log into the console. */ - log_show_color(colors_enabled()); - -- r = make_null_stdio(); -+ if (detect_container() <= 0) -+ r = make_null_stdio(); - if (r < 0) - log_warning_errno(r, "Failed to redirect standard streams to /dev/null, ignoring: %m"); - --- -2.17.1 - diff --git a/meta-balena-honister/recipes-core/systemd/systemd_%.bbappend b/meta-balena-honister/recipes-core/systemd/systemd_%.bbappend index 25aa5e3254..e6fcb7204a 100644 --- a/meta-balena-honister/recipes-core/systemd/systemd_%.bbappend +++ b/meta-balena-honister/recipes-core/systemd/systemd_%.bbappend @@ -1,9 +1,3 @@ -FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" - -SRC_URI:append = " \ - file://0001-core-Don-t-redirect-stdio-to-null-when-running-in-co.patch \ - " - PACKAGECONFIG:remove = "nss-resolve" do_install:append() {