Skip to content

meta: automatically allow devices as input in the stages schemas#1727

Merged
mvo5 merged 1 commit intoosbuild:mainfrom
mvo5:allow-devices-mounts-in-all-stages
Apr 16, 2024
Merged

meta: automatically allow devices as input in the stages schemas#1727
mvo5 merged 1 commit intoosbuild:mainfrom
mvo5:allow-devices-mounts-in-all-stages

Conversation

@mvo5
Copy link
Contributor

@mvo5 mvo5 commented Apr 15, 2024

[as suggested in https://github.com//pull/1726#pullrequestreview-2000367493]
[edit: note that if we merge this we should simplify org.osbuild.{selinux,users,groups}.meta.json to remove the now redudant/identical schemas for devices/mounts]

With the new bootc install to-filesystem support many stages will need a devices/mount setup to bind mount the deployment root from the bootc deployment root of the generated image. To make this globally available just allow "devices/mounts" for all stages in the schema validation.

Note that mounts is already globally allowed so this just adds devices (this was added in 7e776a076 with ostree as the use-case). Nothing will change for the filesystem stages that already define "devices" in a more specialized way.

achilleas-k
achilleas-k previously approved these changes Apr 15, 2024
With the new `bootc install to-filesystem` support many stages
will need a devices/mount setup to bind mount the deployment root
from the bootc deployment root of the generated image. To make
this globally available just allow "devices/mounts" for all stages
in the schema validation.

Note that `mounts` is already globally allowed so this just adds
devices (this was added in `7e776a076` with ostree as the use-case).
Nothing will change for the filesystem stages that already define
"devices" in a more specialized way.
@mvo5 mvo5 force-pushed the allow-devices-mounts-in-all-stages branch from 287dfe9 to 3ed11f9 Compare April 15, 2024 15:05
@mvo5 mvo5 requested a review from achilleas-k April 15, 2024 15:05
mvo5 added a commit to mvo5/images that referenced this pull request Apr 15, 2024
With the new uniform way to handle writing to the bootc image deployment
we can now support a custom `/etc/fstab` again. Similar to what we
do for users [0] and groups [1] we allow also writing a custom fstab
now.

This will need osbuild/osbuild#1727 and also
probably a port of the fstab module to schema_2.

[0] osbuild#571
[1] osbuild#593
@mvo5 mvo5 enabled auto-merge (rebase) April 15, 2024 18:16
@mvo5 mvo5 merged commit 659f1f0 into osbuild:main Apr 16, 2024
github-merge-queue bot pushed a commit to osbuild/images that referenced this pull request Apr 16, 2024
With the new uniform way to handle writing to the bootc image deployment
we can now support a custom `/etc/fstab` again. Similar to what we
do for users [0] and groups [1] we allow also writing a custom fstab
now.

This will need osbuild/osbuild#1727 and also
probably a port of the fstab module to schema_2.

[0] #571
[1] #593
github-merge-queue bot pushed a commit to osbuild/images that referenced this pull request Apr 16, 2024
With the new uniform way to handle writing to the bootc image deployment
we can now support a custom `/etc/fstab` again. Similar to what we
do for users [0] and groups [1] we allow also writing a custom fstab
now.

This will need osbuild/osbuild#1727 and also
probably a port of the fstab module to schema_2.

[0] #571
[1] #593
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants