diff --git a/Dockerfile b/Dockerfile index 27b548c2..d849c3ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/contrib/packaging/README-usr-extras.md b/contrib/packaging/README-usr-extras.md new file mode 100644 index 00000000..81805fff --- /dev/null +++ b/contrib/packaging/README-usr-extras.md @@ -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. diff --git a/contrib/packaging/usr-extras/lib/bootc/kargs.d/21-console-hvc0.toml b/contrib/packaging/usr-extras/lib/bootc/kargs.d/21-console-hvc0.toml new file mode 100644 index 00000000..2ebed183 --- /dev/null +++ b/contrib/packaging/usr-extras/lib/bootc/kargs.d/21-console-hvc0.toml @@ -0,0 +1,2 @@ +# https://bugzilla.redhat.com/show_bug.cgi?id=2353887 +kargs = ["console=hvc0"]