From d1a4e2530d31e586e8904e76a6e55acd1c8c337f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 30 Apr 2024 18:09:00 +0200 Subject: [PATCH] EL9: tmp on tpmfs ready in C10S --- common-el9.yaml | 11 +++++++++++ common.yaml | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/common-el9.yaml b/common-el9.yaml index 824d0cb5..7d8f94fd 100644 --- a/common-el9.yaml +++ b/common-el9.yaml @@ -7,3 +7,14 @@ packages: # Gluster - Used for Openshift e2e gluster testcases # Reverts https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/367 and add it for all arches - glusterfs-fuse + +postprocess: + - | + #!/usr/bin/env bash + set -xeuo pipefail + # Enable tmp-on-tmpfs by default because we don't want to have things leak + # across reboots, it increases alignment with FCOS, and also fixes the + # Live ISO. First, verify that RHEL is still disabling. + grep -q '# RHEL-only: Disable /tmp on tmpfs' /usr/lib/systemd/system/basic.target + echo '# RHCOS-only: we follow the Fedora/upstream default' >> /usr/lib/systemd/system/basic.target + echo 'Wants=tmp.mount' >> /usr/lib/systemd/system/basic.target diff --git a/common.yaml b/common.yaml index 90acd478..8b67c59e 100644 --- a/common.yaml +++ b/common.yaml @@ -146,16 +146,6 @@ postprocess: # FIXME: Why is this only broken here? NM isn't removing the link? sed -i '/etc.resolv/d' /usr/lib/tmpfiles.d/etc.conf - - | - #!/usr/bin/env bash - set -xeuo pipefail - # Enable tmp-on-tmpfs by default because we don't want to have things leak - # across reboots, it increases alignment with FCOS, and also fixes the - # Live ISO. First, verify that RHEL is still disabling. - grep -q '# RHEL-only: Disable /tmp on tmpfs' /usr/lib/systemd/system/basic.target - echo '# RHCOS-only: we follow the Fedora/upstream default' >> /usr/lib/systemd/system/basic.target - echo 'Wants=tmp.mount' >> /usr/lib/systemd/system/basic.target - - | #!/usr/bin/env bash set -xeo pipefail