mirror of
https://github.com/containers/bootc.git
synced 2026-02-05 15:45:53 +01:00
build-sys: Inject hvc0 by default
In order to debug failures more reliably we really always want a virtual
console.
It turns out the Fedora kernel configs for a while have done
9a0d7ce2af
which means hvc0 is available from very early boot.
I am probably going to argue to do this in all Fedora derivatives by
default soon but let's start here.
Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
@@ -61,6 +61,8 @@ RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/config
|
||||
# Support overriding the rootfs at build time conveniently
|
||||
ARG rootfs=
|
||||
RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/configure-rootfs "${variant}" "${rootfs}"
|
||||
# Inject additional content
|
||||
COPY --from=packaging /usr-extras/ /usr/
|
||||
# Install the RPM built in the build stage
|
||||
# This replaces the manual file deletion hack and COPY, ensuring proper package management
|
||||
# Use rpm -Uvh with --oldpackage to allow replacing with dev version
|
||||
|
||||
8
contrib/packaging/README-usr-extras.md
Normal file
8
contrib/packaging/README-usr-extras.md
Normal file
@@ -0,0 +1,8 @@
|
||||
# Understanding usr-extras
|
||||
|
||||
The usr-extras directory contains
|
||||
content we inject into all container images
|
||||
built from this project.
|
||||
|
||||
It is likely though that some of this will
|
||||
end up in downstream operating systems instead.
|
||||
@@ -0,0 +1,2 @@
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2353887
|
||||
kargs = ["console=hvc0"]
|
||||
Reference in New Issue
Block a user