From cbd531bc534eaaa2754b0831548a8d3cef248582 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 20 Sep 2024 12:56:50 -0400 Subject: [PATCH] tier-0: fix sed invocation Classic sed invocation footgun. Doing `-ie` actually binds the `e` to `-i` which tells sed to backup the original with a suffix of `e`. This gets rid of `/usr/lib/tmpfiles.d/provision.confe`. systemd-tmpfiles ignores files that don't have `.conf` so the stray file had no effect. --- tier-0/basic-fixes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tier-0/basic-fixes.yaml b/tier-0/basic-fixes.yaml index d9fe059..7043309 100644 --- a/tier-0/basic-fixes.yaml +++ b/tier-0/basic-fixes.yaml @@ -23,7 +23,7 @@ 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 -ie 's, /root, /var/roothome,' /usr/lib/tmpfiles.d/provision.conf + sed -i -e 's, /root, /var/roothome,' /usr/lib/tmpfiles.d/provision.conf # Because /var/roothome is also defined in rpm-ostree-0-integration.conf # we need to delete /var/roothome - sed -ie '/^d- \/var\/roothome /d' /usr/lib/tmpfiles.d/provision.conf + sed -i -e '/^d- \/var\/roothome /d' /usr/lib/tmpfiles.d/provision.conf