Skip to content

Commit f259770

Browse files
committed
deps: bump images to 0.231.0
Updates images. This (partially) resolves an issue [1] we were seeing. We also need a new workaround for files being in the right places for Fedora 43 and up due to this commit [2] in `bootupd`. [1]: #421 [2]: coreos/bootupd@1c02bc7 Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
1 parent 157b7c9 commit f259770

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

doc/01-usage.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,14 @@ RUN dnf install -y \
204204
biosdevname \
205205
prefixdevname \
206206
&& dnf clean all
207-
# shim-x64 is marked installed but the files are not in the expected
208-
# place for https://github.com/osbuild/osbuild/blob/v160/stages/org.osbuild.grub2.iso#L91, see
209-
# workaround via reinstall, we could add a config to the grub2.iso
210-
# stage to allow a different prefix that then would be used by
211-
# anaconda.
212-
# once https://github.com/osbuild/osbuild/pull/2202 is merged we
213-
# can update images/ to set the correct efi_src_dir and this can
214-
# be removed
215-
RUN dnf reinstall -y shim-x64
207+
208+
# On Fedora 42 this is necessary to get files in the right places
209+
# RUN dnf reinstall -y shim-x64
210+
211+
# On Fedora 43 and up this is necessary to get files in the right
212+
# places
213+
RUN mkdir -p /boot/efi && cp -ra /usr/lib/efi/*/*/EFI /boot/efi
214+
216215
# lorax wants to create a symlink in /mnt which points to /var/mnt
217216
# on bootc but /var/mnt does not exist on some images.
218217
#

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ require (
1111
github.com/cheggaaa/pb/v3 v3.1.7
1212
github.com/gobwas/glob v0.2.3
1313
github.com/mattn/go-isatty v0.0.20
14-
github.com/osbuild/blueprint v1.18.0
15-
github.com/osbuild/images v0.228.0
14+
github.com/osbuild/blueprint v1.20.0
15+
github.com/osbuild/images v0.231.0
1616
github.com/sirupsen/logrus v1.9.3
1717
github.com/spf13/cobra v1.10.2
1818
github.com/spf13/pflag v1.0.10

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,10 @@ github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU
287287
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
288288
github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8=
289289
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
290-
github.com/osbuild/blueprint v1.18.0 h1:Q95lRlPegoeb0uSgmY2yQK+oF8vZjmmxd61zRVdiBL0=
291-
github.com/osbuild/blueprint v1.18.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
292-
github.com/osbuild/images v0.228.0 h1:DL2W1tGkBcO0W5nS/NnVi6DaFDMNPBFI6zIoARZkXKE=
293-
github.com/osbuild/images v0.228.0/go.mod h1:Cs7zFV8rmbVHn+19ArNdjd1AtFk+LC9dOOHuxiSLghw=
290+
github.com/osbuild/blueprint v1.20.0 h1:O1FzTXhCxxwquROttv2nC827JYUJCT0rLypAltV2MpM=
291+
github.com/osbuild/blueprint v1.20.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
292+
github.com/osbuild/images v0.231.0 h1:QbjOqC777TfdE5KNco9r+XgBvBn0NPoglUPZPaQxTos=
293+
github.com/osbuild/images v0.231.0/go.mod h1:04grrQg/kMDXFysqFxQNQSNGvKFdzlf6NM7k15gPiCo=
294294
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
295295
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
296296
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

0 commit comments

Comments
 (0)