From 489bcd8ca1c0a31c5087bb7559276b34179832be Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 20 Jun 2025 15:24:46 -0400 Subject: [PATCH] minimal/basic-fixes: redirect sed commands stdout > /dev/null Not sure why but when you try to build c9s with rpm-ostree from git main the change in [1] causes the sed commands here to exit with a weird error: ``` sed: couldn't close stdout: Bad file descriptor ``` Let's just redirect to /dev/null for now and maybe we can drop it longer term when c9s goes away. See also [2] where this was reported. [1] https://github.com/coreos/rpm-ostree/commit/f4aecb9b62a97eee8368ca8058b33325891cd62d [2] https://github.com/coreos/rpm-ostree/pull/5388#issuecomment-2971623787 --- minimal/basic-fixes.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/minimal/basic-fixes.yaml b/minimal/basic-fixes.yaml index 7043309..c636e8c 100644 --- a/minimal/basic-fixes.yaml +++ b/minimal/basic-fixes.yaml @@ -23,7 +23,13 @@ postprocess: # tmpfiles.d unit for `/var/roothome` is fine, but this actually doesn't # work if we want to use tmpfiles.d to write to `/root/.ssh` because # tmpfiles gives up on that before getting to `/var/roothome`. - sed -i -e 's, /root, /var/roothome,' /usr/lib/tmpfiles.d/provision.conf + # + # Redirect stdout to /dev/null because of some weird stdout issue + # with newer rpm-ostree: https://github.com/coreos/rpm-ostree/pull/5388#issuecomment-2971623787 + sed -i -e 's, /root, /var/roothome,' /usr/lib/tmpfiles.d/provision.conf > /dev/null # Because /var/roothome is also defined in rpm-ostree-0-integration.conf # we need to delete /var/roothome - sed -i -e '/^d- \/var\/roothome /d' /usr/lib/tmpfiles.d/provision.conf + # + # Redirect stdout to /dev/null because of some weird stdout issue + # with newer rpm-ostree: https://github.com/coreos/rpm-ostree/pull/5388#issuecomment-2971623787 + sed -i -e '/^d- \/var\/roothome /d' /usr/lib/tmpfiles.d/provision.conf > /dev/null