many: lorax template split (HMS-9524) #1949
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
supakeen
force-pushed
the
lorax-template-split
branch
from
329e74f to
32facfc
Compare
supakeen
requested review from
achilleas-k,
bcl,
lzap,
mvo5 and
thozza
and removed request for
lzap and
mvo5
This was referenced Oct 13, 2025
thozza
previously approved these changes
Oct 13, 2025
Member
thozza
left a comment
thozza
left a comment
There was a problem hiding this comment.
Thanks. This looks quite OK after all.
Member
Author
|
This will conflict with #1942 so I took it out of the queue; I'll need to regenerate checksums after that lands. |
supakeen
force-pushed
the
lorax-template-split
branch
from
32facfc to
3e06e00
Compare
Member
Author
bcl
approved these changes
Oct 13, 2025
Contributor
bcl
left a comment
bcl
left a comment
There was a problem hiding this comment.
Checksums causing a rebase? Inconceivable!
achilleas-k
reviewed
Oct 13, 2025
Member
achilleas-k
left a comment
achilleas-k
left a comment
There was a problem hiding this comment.
This turned out quite nice after all.
LGTM, but the commit message needs to be updated (references "next commit").
Make the lorax templates in the image configs in the yaml definitions be lists of a new type `InstallerLoraxTemplate` so that we can add additional information to each template. The additional information in this case is if the lorax template should be executed before or after dracut. Since lorax templates often delete things out of the filesystem tree it influences what dracut will copy into the initramfs. In a recent bug [1] this reared its head because an executable that was previously deleted by lorax now ends up in the initramfs. Since `runtime-cleanup.tmpl` deletes dracut it has to run after dracut so let's move it there. [1]: osbuild#1947 Signed-off-by: Simon de Vlieger <[email protected]>
supakeen
force-pushed
the
lorax-template-split
branch
from
3e06e00 to
a832572
Compare
Member
Author
|
@achilleas-k Ugh, rebase error. I've changed the commit message. |
thozza
approved these changes
Oct 14, 2025
supakeen
added a commit
to supakeen/bootc-image-builder
that referenced
this pull request
Oct 14, 2025
This reverts commit cce2b81. When a new release of images is that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
supakeen
added a commit
to supakeen/bootc-image-builder
that referenced
this pull request
Oct 14, 2025
This reverts commit cce2b81. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
supakeen
added a commit
to supakeen/bootc-image-builder
that referenced
this pull request
Oct 20, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
github-merge-queue bot
pushed a commit
to osbuild/bootc-image-builder
that referenced
this pull request
Oct 21, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
supakeen
added a commit
to supakeen/bootc-image-builder
that referenced
this pull request
Oct 21, 2025
This reverts commit cce2b81. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
croissanne
added a commit
to croissanne/osbuild-composer
that referenced
this pull request
Oct 21, 2025
Changes with 0.205.0 ---------------- - Convert the test config map to a config list (osbuild/images#1900) - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/images#1926) - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger - Support uploading to OpenStack (osbuild/images#1921) - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger - disk: make addPartitionsForBootMode() arch specific (osbuild/images#1928) - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger - distro: add ova image type for bootc [HMS-9503] (osbuild/images#1938) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - fedora/minimal: drop uuids in partition tables (osbuild/images#1932) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt Changes with 0.206.0 ---------------- - Update osbuild dependency commit ID to latest (osbuild/images#1945) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - deps: bump blueprint to 1.16.0 (osbuild/images#1952) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers - fedora: Drop tigervnc on F42 and later (osbuild/images#1942) - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza - fedora: document root kickstart (osbuild/images#1936) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt - fedora: rawhide is 44 (osbuild/images#1943) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza - many: lorax template split (HMS-9524) (osbuild/images#1949) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza Changes with 0.207.0 ---------------- - Enable fedora 43 unit testing (osbuild/images#1954) - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza - fedora: update cloud_kernel_options (osbuild/images#1953) - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/images#1956) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger Changes with 0.208.0 ---------------- - Schutzfile: switch CI runner to Fedora 42 (osbuild/images#1955) - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza - Support uploading to IBM Cloud (osbuild/images#1924) - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/images#1941) - Author: Sanne Raymaekers, Reviewers: Nobody
croissanne
added a commit
to croissanne/osbuild-composer
that referenced
this pull request
Oct 21, 2025
Changes with 0.205.0 ---------------- - Convert the test config map to a config list (osbuild/images#1900) - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/images#1926) - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger - Support uploading to OpenStack (osbuild/images#1921) - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger - disk: make addPartitionsForBootMode() arch specific (osbuild/images#1928) - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger - distro: add ova image type for bootc [HMS-9503] (osbuild/images#1938) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - fedora/minimal: drop uuids in partition tables (osbuild/images#1932) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt Changes with 0.206.0 ---------------- - Update osbuild dependency commit ID to latest (osbuild/images#1945) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - deps: bump blueprint to 1.16.0 (osbuild/images#1952) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers - fedora: Drop tigervnc on F42 and later (osbuild/images#1942) - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza - fedora: document root kickstart (osbuild/images#1936) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt - fedora: rawhide is 44 (osbuild/images#1943) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza - many: lorax template split (HMS-9524) (osbuild/images#1949) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza Changes with 0.207.0 ---------------- - Enable fedora 43 unit testing (osbuild/images#1954) - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza - fedora: update cloud_kernel_options (osbuild/images#1953) - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/images#1956) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger Changes with 0.208.0 ---------------- - Schutzfile: switch CI runner to Fedora 42 (osbuild/images#1955) - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza - Support uploading to IBM Cloud (osbuild/images#1924) - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/images#1941) - Author: Sanne Raymaekers, Reviewers: Nobody
ondrejbudai
pushed a commit
to osbuild/osbuild-composer
that referenced
this pull request
Oct 22, 2025
Changes with 0.205.0 ---------------- - Convert the test config map to a config list (osbuild/images#1900) - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/images#1926) - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger - Support uploading to OpenStack (osbuild/images#1921) - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger - disk: make addPartitionsForBootMode() arch specific (osbuild/images#1928) - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger - distro: add ova image type for bootc [HMS-9503] (osbuild/images#1938) - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger - fedora/minimal: drop uuids in partition tables (osbuild/images#1932) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt Changes with 0.206.0 ---------------- - Update osbuild dependency commit ID to latest (osbuild/images#1945) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger - deps: bump blueprint to 1.16.0 (osbuild/images#1952) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers - fedora: Drop tigervnc on F42 and later (osbuild/images#1942) - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza - fedora: document root kickstart (osbuild/images#1936) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt - fedora: rawhide is 44 (osbuild/images#1943) - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza - many: lorax template split (HMS-9524) (osbuild/images#1949) - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza Changes with 0.207.0 ---------------- - Enable fedora 43 unit testing (osbuild/images#1954) - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza - fedora: update cloud_kernel_options (osbuild/images#1953) - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/images#1956) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger Changes with 0.208.0 ---------------- - Schutzfile: switch CI runner to Fedora 42 (osbuild/images#1955) - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza - Support uploading to IBM Cloud (osbuild/images#1924) - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/images#1941) - Author: Sanne Raymaekers, Reviewers: Nobody
github-merge-queue bot
pushed a commit
to osbuild/bootc-image-builder
that referenced
this pull request
Oct 27, 2025
This reverts commit cce2b81. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Nov 19, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Nov 19, 2025
This reverts commit 7343bca07349f1d17be3b5d1130cc33f039ff7cb. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Nov 25, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Nov 25, 2025
This reverts commit 7343bca07349f1d17be3b5d1130cc33f039ff7cb. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Nov 27, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Nov 27, 2025
This reverts commit 7343bca07349f1d17be3b5d1130cc33f039ff7cb. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Dec 3, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Dec 3, 2025
This reverts commit 7343bca07349f1d17be3b5d1130cc33f039ff7cb. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Dec 8, 2025
In images the Lorax templates are a struct since 0.206.0 [1]. [1]: osbuild/images#1949 Signed-off-by: Simon de Vlieger <[email protected]>
mvo5
pushed a commit
to mvo5/image-builder-cli
that referenced
this pull request
Dec 8, 2025
This reverts commit 7343bca07349f1d17be3b5d1130cc33f039ff7cb. When a new release of images is merged that contains [1] we can push this revert through after verification that the problem remains gone. [1]: osbuild/images#1949
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the bug report in #1947; I've tested this with the
everything-netinstISO. In the investigation in the bug report it was discovered that lorax normally deletessystemd-gpt-autogeneratorbefore the initramfs is regenerated. In 7159e43 initramfs generation was moved before the execution of lorax templates which causedsystemd-gpt-auto-generatorto be included in it.Since Fedora 42
systemd-gpt-auto-generatoractually gets activated when it is inside theinitramfsand with the previous commit all conditions for it to run were met. Preventing ISOs from being booted as disk images in UEFI mode.In this PR I turn the lorax template installer configuration into objects with an optional property to execute after dracut; this allows us to run the relevant templates both before, and after.
Since
runtime-postinstall.tmplremovessystemd-gpt-auto-generator, then dracut runs, and after thatruntime-cleanup.tmplruns (which removes dracut) we now no longer havesystemd-gpt-auto-generatorin our initramfs.This supercedes #1948 which implemented a workaround.