From d6f00d618fa7f9a5ae97d4c1d0eb28f9a58062b7 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 20 Sep 2024 11:05:10 -0400
Subject: [PATCH 1/3] tier-0: explicitly list coreutils

This currently is already in tier-0, but it feels odd to not explicitly
list it. Noticed while comparing to FCOS manifests, which does list it.
---
 tier-0/manifest.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tier-0/manifest.yaml b/tier-0/manifest.yaml
index 46b6277..877ae18 100644
--- a/tier-0/manifest.yaml
+++ b/tier-0/manifest.yaml
@@ -53,6 +53,8 @@ include:
   - basic-fixes.yaml
 
 packages:
+  # this is implied by dependencies but let's make it explicit
+  - coreutils
   # needed for building derived container images
   - dnf5
   # Even in tier-0, we have this.  If you don't want SELinux today, you'll need

From b9fdc53e870fdb65fcbf88fef13315758d4d419e Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 20 Sep 2024 11:15:19 -0400
Subject: [PATCH 2/3] tier-x: explicitly list podman, skopeo

They're such important tools to the experience, it's weird to leave it
as being it implied by bootc only.
---
 tier-x/manifest.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tier-x/manifest.yaml b/tier-x/manifest.yaml
index dc8ee4d..8b316f5 100644
--- a/tier-x/manifest.yaml
+++ b/tier-x/manifest.yaml
@@ -13,6 +13,9 @@ packages:
   # crun recommends but doesn't require criu and criu-libs. We want them for
   # checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
   - criu criu-libs
+  # deps of bootc, but let's be explicit. e.g. even if bootc drops the skopeo
+  # dep, we still want it
+  - podman skopeo
   # storage
   - cryptsetup
   - lvm2

From 62be40d8b48aeecaf0fbfc92addf3d409360c139 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 20 Sep 2024 11:16:02 -0400
Subject: [PATCH 3/3] tier-0: drop `mkdir -p /run` workaround

This has long been unnecessary.

See also: https://github.com/coreos/fedora-coreos-config/commit/029d320bfe95ab0c59b6fb376467c03397588e60
---
 tier-0/bootupd.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tier-0/bootupd.yaml b/tier-0/bootupd.yaml
index 7d3ebf3..2423367 100644
--- a/tier-0/bootupd.yaml
+++ b/tier-0/bootupd.yaml
@@ -25,7 +25,5 @@ postprocess:
   - |
     #!/bin/bash
     set -xeuo pipefail
-    # Until we have https://github.com/coreos/rpm-ostree/pull/2275
-    mkdir -p /run
     # Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
     /usr/bin/bootupctl backend generate-update-metadata