Skip to content

Commit e99410d

Browse files
committed
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 https://gitlab.com/cki-project/kernel-ark/-/commit/9a0d7ce2af11ef7b9a3bc3073e13dc9983b7e245 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>
1 parent 9a8bf1b commit e99410d

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/config
6161
# Support overriding the rootfs at build time conveniently
6262
ARG rootfs=
6363
RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/configure-rootfs "${variant}" "${rootfs}"
64+
# Inject additional content
65+
COPY --from=packaging /usr-extras/ /usr/
6466
# Install the RPM built in the build stage
6567
# This replaces the manual file deletion hack and COPY, ensuring proper package management
6668
# Use rpm -Uvh with --oldpackage to allow replacing with dev version
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Understanding usr-extras
2+
3+
The usr-extras directory contains
4+
content we inject into all container images
5+
built from this project.
6+
7+
It is likely though that some of this will
8+
end up in downstream operating systems instead.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# https://bugzilla.redhat.com/show_bug.cgi?id=2353887
2+
kargs = ["console=hvc0"]

0 commit comments

Comments
 (0)