Skip to content

Commit

Permalink
Merge branch 'pr/coreutils' into 'main'
Browse files Browse the repository at this point in the history
tier-0/x: various tweaks

See merge request fedora/bootc/base-images!54
  • Loading branch information
jlebon committed Sep 20, 2024
2 parents 8a37080 + 62be40d commit 92172d2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 0 additions & 2 deletions tier-0/bootupd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions tier-0/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tier-x/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 92172d2

Please sign in to comment.