Skip to content

many: lorax template split (HMS-9524)#1949

Merged
supakeen merged 1 commit into
osbuild:mainfrom
supakeen:lorax-template-split
Oct 14, 2025
Merged

many: lorax template split (HMS-9524)#1949
supakeen merged 1 commit into
osbuild:mainfrom
supakeen:lorax-template-split

Conversation

@supakeen

@supakeen supakeen commented Oct 13, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

This PR fixes the bug report in #1947; I've tested this with the everything-netinst ISO. In the investigation in the bug report it was discovered that lorax normally deletes systemd-gpt-autogenerator before the initramfs is regenerated. In 7159e43 initramfs generation was moved before the execution of lorax templates which caused systemd-gpt-auto-generator to be included in it.

Since Fedora 42 systemd-gpt-auto-generator actually gets activated when it is inside the initramfs and 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.tmpl removes systemd-gpt-auto-generator, then dracut runs, and after that runtime-cleanup.tmpl runs (which removes dracut) we now no longer have systemd-gpt-auto-generator in our initramfs.

This supercedes #1948 which implemented a workaround.

@supakeen supakeen force-pushed the lorax-template-split branch from 329e74f to 32facfc Compare October 13, 2025 12:46
@supakeen supakeen marked this pull request as ready for review October 13, 2025 12:59
@supakeen supakeen requested a review from a team as a code owner October 13, 2025 12:59
@supakeen supakeen requested review from achilleas-k, bcl, lzap, mvo5 and thozza and removed request for lzap and mvo5 October 13, 2025 12:59
This was referenced Oct 13, 2025
Closed
Closed
thozza
thozza previously approved these changes Oct 13, 2025
View reviewed changes

@thozza thozza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. This looks quite OK after all.

bcl
bcl previously approved these changes Oct 13, 2025
View reviewed changes

@bcl bcl left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

@supakeen supakeen added this pull request to the merge queue Oct 13, 2025
@supakeen supakeen removed this pull request from the merge queue due to a manual request Oct 13, 2025
@supakeen

supakeen commented Oct 13, 2025

Copy link
Copy Markdown
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 supakeen dismissed stale reviews from bcl and thozza via 3e06e00 October 13, 2025 17:04
@supakeen supakeen force-pushed the lorax-template-split branch from 32facfc to 3e06e00 Compare October 13, 2025 17:04
@supakeen supakeen requested review from bcl and thozza October 13, 2025 17:04
@supakeen

supakeen commented Oct 13, 2025

Copy link
Copy Markdown
Member Author

@bcl / @thozza. I had to re-base and re-run the checksums. Otherwise nothing has changed :)

bcl
bcl approved these changes Oct 13, 2025
View reviewed changes

@bcl bcl left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checksums causing a rebase? Inconceivable!

achilleas-k
achilleas-k reviewed Oct 13, 2025
View reviewed changes

@achilleas-k achilleas-k left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This turned out quite nice after all.
LGTM, but the commit message needs to be updated (references "next commit").

@supakeen
many: lorax templates as objects
a832572 
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]: #1947

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
@supakeen supakeen force-pushed the lorax-template-split branch from 3e06e00 to a832572 Compare October 14, 2025 04:43
@supakeen

supakeen commented Oct 14, 2025

Copy link
Copy Markdown
Member Author

@achilleas-k Ugh, rebase error. I've changed the commit message.

@supakeen supakeen requested a review from achilleas-k October 14, 2025 04:43
@supakeen supakeen deleted the lorax-template-split branch October 14, 2025 08:01
supakeen added a commit to supakeen/bootc-image-builder that referenced this pull request Oct 14, 2025
@supakeen
Revert "iso: inhibit gpt-auto"
7cccc76 
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/image-builder#1949
@supakeen supakeen mentioned this pull request Oct 14, 2025
Merged
supakeen added a commit to supakeen/bootc-image-builder that referenced this pull request Oct 14, 2025
@supakeen
Revert "iso: inhibit gpt-auto"
849851d 
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/image-builder#1949
@thozza thozza mentioned this pull request Oct 14, 2025
Merged
supakeen added a commit to supakeen/bootc-image-builder that referenced this pull request Oct 20, 2025
@supakeen
iso: images compatibility
4140641 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
github-merge-queue Bot pushed a commit to osbuild/bootc-image-builder that referenced this pull request Oct 21, 2025
@supakeen
iso: images compatibility
3d6d3ea 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
supakeen added a commit to supakeen/bootc-image-builder that referenced this pull request Oct 21, 2025
@supakeen
Revert "iso: inhibit gpt-auto"
7f52409 
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/image-builder#1949
croissanne added a commit to croissanne/osbuild-composer that referenced this pull request Oct 21, 2025
@croissanne
go.mod: update osbuild/images to v0.208.0
9704a69 
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/image-builder#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/image-builder#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/image-builder#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/image-builder#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/image-builder#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/image-builder#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/image-builder#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/image-builder#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/image-builder#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/image-builder#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/image-builder#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/image-builder#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
@croissanne croissanne mentioned this pull request Oct 21, 2025
Merged
croissanne added a commit to croissanne/osbuild-composer that referenced this pull request Oct 21, 2025
@croissanne
go.mod: update osbuild/images to v0.208.0
0a6683b 
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/image-builder#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/image-builder#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/image-builder#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/image-builder#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/image-builder#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/image-builder#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/image-builder#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/image-builder#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/image-builder#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/image-builder#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/image-builder#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/image-builder#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
ondrejbudai pushed a commit to osbuild/osbuild-composer that referenced this pull request Oct 22, 2025
@croissanne @ondrejbudai
go.mod: update osbuild/images to v0.208.0
87d7c8b 
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/image-builder#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/image-builder#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/image-builder#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/image-builder#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/image-builder#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/image-builder#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/image-builder#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/image-builder#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/image-builder#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/image-builder#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/image-builder#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/image-builder#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#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
@supakeen
Revert "iso: inhibit gpt-auto"
c0604b1 
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/image-builder#1949
@mvo5 mvo5 mentioned this pull request Oct 28, 2025
Merged
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Nov 19, 2025
@supakeen @mvo5
iso: images compatibility
2b1271e 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Nov 19, 2025
@supakeen @mvo5
Revert "iso: inhibit gpt-auto"
a08e17b 
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/image-builder#1949
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Nov 25, 2025
@supakeen @mvo5
iso: images compatibility
5cb2b8e 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Nov 25, 2025
@supakeen @mvo5
Revert "iso: inhibit gpt-auto"
b3afebe 
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/image-builder#1949
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Nov 27, 2025
@supakeen @mvo5
iso: images compatibility
99f4ae0 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Nov 27, 2025
@supakeen @mvo5
Revert "iso: inhibit gpt-auto"
d0800b9 
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/image-builder#1949
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Dec 3, 2025
@supakeen @mvo5
iso: images compatibility
69317b7 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Dec 3, 2025
@supakeen @mvo5
Revert "iso: inhibit gpt-auto"
5a931d3 
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/image-builder#1949
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Dec 8, 2025
@supakeen @mvo5
iso: images compatibility
3b477e1 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild/image-builder#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
mvo5 pushed a commit to mvo5/image-builder-cli that referenced this pull request Dec 8, 2025
@supakeen @mvo5
Revert "iso: inhibit gpt-auto"
bdf73da 
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/image-builder#1949
achilleas-k pushed a commit to achilleas-k/image-builder that referenced this pull request Jun 17, 2026
@supakeen @achilleas-k
iso: images compatibility
868e8ff 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
achilleas-k pushed a commit to achilleas-k/image-builder that referenced this pull request Jun 17, 2026
@supakeen @achilleas-k
Revert "iso: inhibit gpt-auto"
520817a 
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#1949
achilleas-k pushed a commit to achilleas-k/image-builder that referenced this pull request Jun 17, 2026
@supakeen @achilleas-k
iso: images compatibility
4d25eeb 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
achilleas-k pushed a commit to achilleas-k/image-builder that referenced this pull request Jun 17, 2026
@supakeen @achilleas-k
Revert "iso: inhibit gpt-auto"
4673b1b 
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#1949
achilleas-k pushed a commit to achilleas-k/image-builder that referenced this pull request Jun 18, 2026
@supakeen @achilleas-k
iso: images compatibility
2d28bb6 
In images the Lorax templates are a struct since 0.206.0 [1].

[1]: osbuild#1949

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
achilleas-k pushed a commit to achilleas-k/image-builder that referenced this pull request Jun 18, 2026
@supakeen @achilleas-k
Revert "iso: inhibit gpt-auto"
8c1f3c8 
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#1949
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thozza thozza thozza approved these changes
@achilleas-k achilleas-k Awaiting requested review from achilleas-k
+1 more reviewer
@bcl bcl bcl approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@supakeen @bcl @achilleas-k @thozza