Composefs-native backend #1314

Johan-Liebert1 · 2025-05-13T07:47:00Z

A rough draft for installing and booting using composefs-rs. Current only works for install to-disk via bootc install to-disk --composefs [options]

Issues:

Issue with transport type continers-storage, viz, #117. Needs some ironing out.
Bootc images need rebuilding with composfs-rs components, namely composfs-setup-root

I have a few logs being logged as warning, just for visibility. Will remove them when it's ready.
Same with composefs-rs patch in cargo.toml

Done to facilitate the installation of a composefs repository to disk Signed-off-by: Pragyan Poudyal <[email protected]>

Signed-off-by: Pragyan Poudyal <[email protected]>

cgwalters

Thanks for working on this!!

cgwalters · 2025-05-13T10:23:04Z

lib/src/install.rs

+        .create_dir_all("composefs")
+        .context("Creating dir 'composefs'")?;
+
+    tracing::warn!("STATE: {state:#?}");


I'd recommend dbg! for this type of stuff; it will build locally but not pass CI so it can't be accidentally merged.

I intend to remove all these logs. They were only for debugging purposes

Yep that makes sense, what I meant is that use dbg! locally. (Or use tracing::debug! and keep the tracing in there and just use the tracing selector to ensure you see what you want...we are really chatty with a big env RUST_LOG=debug unfortunately today, mostly in container fetches)

cgwalters · 2025-05-13T10:23:21Z

lib/src/cli.rs

@@ -1199,7 +1199,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                    let fd =
                        std::fs::File::open(&path).with_context(|| format!("Reading {path}"))?;
                    let digest: fsverity::Sha256HashValue = fsverity::measure_verity(&fd)?;
-                    let digest = hex::encode(digest);
+                    let digest = digest.to_hex();


I think this should be squashed with the previous commit, and it may make sense to have a "bump composefs-rs" prep PR split out right?

Right, that makes sense. I'll put this in a separate PR

Done in #1403

cgwalters · 2025-05-13T10:24:46Z

lib/src/install.rs

 async fn install_to_filesystem_impl(
    state: &State,
    rootfs: &mut RootSetup,
    cleanup: Cleanup,
+    composefs: bool,


I think this would make sense as part of state

I was conflicted on where to put this. Thanks for the review. I'll add this to State

cgwalters · 2025-05-13T11:14:46Z

lib/src/install.rs

-            &imgstore,
-        )
-        .await?;
+        tracing::warn!(


Same comment re dbg! or this one could also make sense as a tracing::debug! that gets left in right?

Ah, yes. We can keep this one as debug

cgwalters · 2025-05-13T13:07:15Z

bootc install to-disk --composefs

The branding here is a bit confusing because of course, bootc already uses composefs. Just the https://github.com/composefs/composefs/ version, and that is "indirectly" via ostree.

Bigger picture I think what we're trying to aim for here primarily is "sealed" images right? In that case then, one thing I think would make sense is that we don't even have an option to install - we determine what to do by inspecting the container.

It does of course make sense to eventually support unsealed images this way too...which will be extremely important for eventually migrating existing ostree systems. There's an enormous set of details there though.

So my proposal in a nutshell:

Let's call it "composefs native" storage or so (the branding here is again hard, open to other ideas)
Default to (i.e. require) composefs-native storage if we detect the image is a sealed UKI.
Make the opt-in flag called like --composefs-native or so for unsealed cases. That said, it could also make sense to add some sort of flag to the container image to do this instead; because I think most people who want to do this will always want to do it. It's basically similar to what we have with kernel arguments; they can be either baked into the container or applied out of band, and in the general case we need both.

Johan-Liebert1 · 2025-05-15T04:49:31Z

Let's call it "composefs native" storage or so (the branding here is again hard, open to other ideas)

I think this works. Or we could have --composefs-native-experimental or something?

Default to (i.e. require) composefs-native storage if we detect the image is a sealed UKI.

Curious about this. Is there a reason we'd want composfs native storage in this case?

cgwalters · 2025-05-15T13:11:20Z

Curious about this. Is there a reason we'd want composfs native storage in this case?

Isn't the whole idea that we're aiming for the sealed case?

Signed-off-by: Pragyan Poudyal <[email protected]>

Johan-Liebert1 · 2025-06-05T08:44:24Z

I'll be getting back to this PR next Monday. Been working on a separate issue this week...

cgwalters · 2025-06-16T18:30:04Z

lib/src/install/baseline.rs

@@ -403,6 +409,8 @@ pub(crate) fn install_create_rootfs(
        "root",
        opts.wipe,
        mkfs_options.iter().copied(),
+        // TODO: Add cli option for this
+        Some(uuid::uuid!("6523f8ae-3eb1-4e2a-a05a-18b695ae656f")),


It looks like you chose the alpha architecture uuid; it'd make sense potentially to use the DPS UUIDs by default for to-disk but that will require some work.

cc #448 (comment)

Signed-off-by: Pragyan Poudyal <[email protected]>

Also exit early if kargs are passed for `--boot=uki` Signed-off-by: Pragyan Poudyal <[email protected]>

Instead of putting the UKI in `/boot` in the root partition, this commit moves it to the ESP. Update grub user.cfg and pass the disk UUID to `--fs-uuid` Signed-off-by: Pragyan Poudyal <[email protected]>

This is currently WIP, as it only shows the currently booted image in use and not any staged or rollback deployments. Signed-off-by: Pragyan Poudyal <[email protected]>

Create a .origin file in /sysroot/state to store image info Signed-off-by: Pragyan Poudyal <[email protected]>

cgwalters · 2025-06-25T15:47:10Z

lib/src/install.rs

+    let esp_devices = [COREOS_ESP_PART_LABEL, ANACONDA_ESP_PART_LABEL]
+        .into_iter()
+        .map(|p| Path::new("/dev/disk/by-partlabel/").join(p));


Two things

We shouldn't use /dev/disk/by-partlabel because that's global state, in the general case we may be creating partitions on a loopback mounted device and don't want to touch any global state

There's a well known UUID for the ESP to use

Combining these, see https://github.com/coreos/bootupd/blob/92a8fe2326e35d893afbe464857408c403d9e7ea/src/blockdev.rs#L41 which perhaps we could move into this codebase and have bootupd use it (because bootupd already uses bootc).

Ah, okay I'll update to not use by-partlabel

perhaps we could move into this codebase and have bootupd use it (because bootupd already uses bootc)

I found this little bit weird, as I feel like this should be the other way around. Is there a reason why bootc uses the bootupctl command rather than the bootup crate?

Is there a reason why bootc uses the bootupctl command rather than the bootup crate?

Well...unless we took over that CLI, that'd mean we duplicate the code.

cgwalters · 2025-06-25T15:47:42Z

lib/src/install.rs

+    create_dir_all(&boot_dir).context("Failed to create boot dir")?;
+
+    // Add the user grug cfg
+    let grub_user_config = format!(


In my ideal world grub related things live in bootupd, not in this project.

And even better if we can make this a static configuration...where grub basically implements the BLS spec and finds things in /EFI/Linux on its own right?

It makes sense to put this in bootupd, but upon discussions with @travier we're still debating on whether we want to push systemd-boot or not, so this is more or less temporary

This part of the GRUB config can not be generated by bootup as it is the deployment boot order in the UKI + GRUB case. See: containers/composefs-rs#38 (comment)

It's not possible to use the BLS spec partial support in GRUB to boot UKI. It does not support the key that we need to do so, thus why we generate GRUB config snippets: ostreedev/ostree#2753 (comment)

Also create `/var` inside `/state/deploy/<image_id>` as a symlink to `../../fedora/os/var` which is to be the case for every deployment Signed-off-by: Pragyan Poudyal <[email protected]>

Signed-off-by: Pragyan Poudyal <[email protected]>

* Implement `bootc upgrade` command for a composefs-native booted system * Refactor UKI and BLS boot entry writing functions to work for upgrade * Prevent using global `/dev/disk/by-partuuid` to get UUID for ESP * Refactor out code for populating `/sysroot/state` Signed-off-by: Pragyan Poudyal <[email protected]>

Store the staged deployment at `/run/composefs/staged-deployment` similar to how it's done in ostree Signed-off-by: Pragyan Poudyal <[email protected]>

On upgrade/switch write UKI and BLS entries with the suffix .staged This should be atomically renamed by the equivalent of `ostree-finalize.service` for composefs. In case of grub menuentries for UKI case, rewrite the entire file by reading /sysroot/state/deploy/<deployment_id> Signed-off-by: Pragyan Poudyal <[email protected]>

This does not yet "apply" the switch, it only stages a deployment Also refactor pulling of a composefs repository to a separate function Signed-off-by: Pragyan Poudyal <[email protected]>

Johan-Liebert1 added 2 commits May 13, 2025 12:26

cli/install: Add composefs option to InstallToDiskOpts

6cfb4be

Done to facilitate the installation of a composefs repository to disk Signed-off-by: Pragyan Poudyal <[email protected]>

cli: Handle compatibility with latest composefs-rs

d03feb2

Signed-off-by: Pragyan Poudyal <[email protected]>

github-actions bot added the area/install Issues related to `bootc install` label May 13, 2025

Johan-Liebert1 added 2 commits May 13, 2025 14:37

install: Pull composefs repository

6be5560

Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Write boot entries

b3d1952

Signed-off-by: Pragyan Poudyal <[email protected]>

Johan-Liebert1 force-pushed the composefs-backend branch from cd42079 to b3d1952 Compare May 13, 2025 09:08

cgwalters reviewed May 13, 2025

View reviewed changes

cgwalters mentioned this pull request May 13, 2025

examples: add bootc/ directory containers/composefs-rs#116

Draft

Johan-Liebert1 added 2 commits May 16, 2025 10:27

Grub wip

83227f5

Signed-off-by: Pragyan Poudyal <[email protected]>

Use discoverable partition specification for rootfs UUID

97b902c

Signed-off-by: Pragyan Poudyal <[email protected]>

travier mentioned this pull request Jun 16, 2025

examples: Add bootc UKI & BLS examples containers/composefs-rs#143

Draft

cgwalters assigned jeckersb Jun 16, 2025

cgwalters requested a review from jeckersb June 16, 2025 18:24

cgwalters reviewed Jun 16, 2025

View reviewed changes

Johan-Liebert1 added 5 commits June 17, 2025 11:29

Bump composefs-rs

151963e

Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Update composefs install options

200d669

Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Introduce flag for bls/uki boot

dbcce3f

Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Get image and transport source_imgref

79f3957

Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Return result from opts.validate

42632ce

Signed-off-by: Pragyan Poudyal <[email protected]>

Johan-Liebert1 force-pushed the composefs-backend branch from 5979f04 to 42632ce Compare June 17, 2025 05:59

travier mentioned this pull request Jun 17, 2025

composefs-rs integration in bootc #1190

Open

Johan-Liebert1 added 4 commits June 17, 2025 17:13

install/composefs: Handle kargs for BLS

eac8e4d

Also exit early if kargs are passed for `--boot=uki` Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Put UKI in the ESP

edcf721

Instead of putting the UKI in `/boot` in the root partition, this commit moves it to the ESP. Update grub user.cfg and pass the disk UUID to `--fs-uuid` Signed-off-by: Pragyan Poudyal <[email protected]>

cli/composefs: Implement status cmd for compoesfs booted system

af8fa4e

This is currently WIP, as it only shows the currently booted image in use and not any staged or rollback deployments. Signed-off-by: Pragyan Poudyal <[email protected]>

install/composefs: Create origin file

770a57b

Create a .origin file in /sysroot/state to store image info Signed-off-by: Pragyan Poudyal <[email protected]>

cgwalters changed the title ~~Composefs backend~~ Composefs-native backend Jun 25, 2025

cgwalters mentioned this pull request Jun 25, 2025

Investigate alignment/intersection with systemd-repart #448

Open

cgwalters reviewed Jun 25, 2025

View reviewed changes

Johan-Liebert1 added 6 commits June 26, 2025 12:16

install/composefs: Move state to /state/deploy/<image_id>

8e68e45

Also create `/var` inside `/state/deploy/<image_id>` as a symlink to `../../fedora/os/var` which is to be the case for every deployment Signed-off-by: Pragyan Poudyal <[email protected]>

cli: Implement bootc status for composefs native booted system

8d9b923

Signed-off-by: Pragyan Poudyal <[email protected]>

cli/composefs: Show staged/rollback deployments

3c7a2e6

Store the staged deployment at `/run/composefs/staged-deployment` similar to how it's done in ostree Signed-off-by: Pragyan Poudyal <[email protected]>

cli/composefs: Implement bootc switch

6098379

This does not yet "apply" the switch, it only stages a deployment Also refactor pulling of a composefs repository to a separate function Signed-off-by: Pragyan Poudyal <[email protected]>

Composefs-native backend #1314

Are you sure you want to change the base?

Composefs-native backend #1314

Uh oh!

Conversation

Johan-Liebert1 commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cgwalters left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cgwalters commented May 13, 2025

Uh oh!

Johan-Liebert1 commented May 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cgwalters commented May 15, 2025

Uh oh!

Johan-Liebert1 commented Jun 5, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Johan-Liebert1 Jun 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Johan-Liebert1 commented May 13, 2025 •

edited

Loading

Johan-Liebert1 commented May 15, 2025 •

edited

Loading

Johan-Liebert1 Jun 26, 2025 •

edited

Loading