Make handling of `boot=` and `root=` kargs idempotent #2141

cgwalters · 2023-01-02T17:31:16Z

dracut/boot-edit: Do nothing if we have a boot= karg

In this case, we shouldn't have anything to do. This is needed
for bootc install which currently sets up these kargs in advance.
containers/bootc#30

dracut/ignition-setup: Use boot= karg if it exists

This will be used with bootc which will default to injecting
a karg for boot.

ignition-uuid-root: no-op if we already have a root= karg

For bootc compatibility.

overlay: More no-ops if we have a boot= and/or root= karg

We can assume the disk image is already set up in this case.

jlebon · 2023-01-03T20:03:43Z

Hmm, so this is to support a bootc-installed FCOS, right? I think it'd be good to discuss what the long-term goal is for bootc and FCOS.

Re. this PR specifically, the use of /dev/disk/by-label/boot is pervasive throughout this codebase. But anyway, we also now have code that ensures that only one filesystem labeled boot exists so it shouldn't be necessary, right? Or are you trying to support systems where that is no longer true?

cgwalters · 2023-01-03T23:19:06Z

Hmm, so this is to support a bootc-installed FCOS, right? I think it'd be good to discuss what the long-term goal is for bootc and FCOS.

Yep, I plan to get something scheduled for this soon this month!

But anyway, we also now have code that ensures that only one filesystem labeled boot exists so it shouldn't be necessary, right?

This scenario arises when one boots one FCOS-derived system, and is using it to install to a different disk.

But this isn't critical to merge soon, so I just marked as draft.

In this case, we shouldn't have anything to do. This is needed for `bootc install` which currently sets up these kargs in advance. containers/bootc#30

This will be used with bootc which will default to injecting a karg for `boot`.

For bootc compatibility.

We can assume the disk image is already set up in this case.

cgwalters · 2023-01-17T20:18:27Z

OK, lifting draft on this one.

cgwalters · 2023-01-17T20:19:51Z

overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-setup-user.sh

+# Copied from
+# https://github.com/dracutdevs/dracut/blob/9491e599282d0d6bb12063eddbd192c0d2ce8acf/modules.d/99base/dracut-lib.sh#L586
+# rather than sourcing it.
+label_uuid_to_dev() {


Maybe this should move to rdcore or so?

cgwalters · 2023-01-18T22:23:54Z

[2023-01-17T21:20:18.693Z] + cosa kola testiso -S --qemu-multipath --scenarios iso-offline-install --output-dir /srv/coreos/tmp/kolaTestIso-7qsbl/kola-testiso-multipath
[2023-01-17T21:20:18.693Z] kola -p qemu-unpriv --output-dir /srv/coreos/tmp/kolaTestIso-7qsbl/kola-testiso-multipath testiso -S --qemu-multipath --scenarios iso-offline-install
[2023-01-17T21:20:18.693Z] Testing scenarios: [iso-offline-install]
[2023-01-17T21:20:18.693Z] Ignoring verification of signature on metal image
[2023-01-17T21:21:26.668Z] FAIL: iso-offline-install ( + metal + multipath) (1m1.819s)
[2023-01-17T21:21:26.668Z]     entered emergency.target in initramfs
[2023-01-17T21:21:26.668Z] Error: entered emergency.target in initramfs

Hm, not seeing the failure there in the logs.

dustymabe · 2023-01-19T01:15:05Z

Hm, not seeing the failure there in the logs.

coreos/fedora-coreos-tracker#1373

jlebon

Seems like the last two commits could be merged?

jlebon · 2023-01-19T20:36:57Z

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-root.service

@@ -9,6 +9,7 @@ After=ignition-disks.service
 # If we've reprovisioned the rootfs, then there's no need to restamp
 ConditionPathExists=!/run/ignition-ostree-transposefs
 ConditionKernelCommandLine=!rootfs.roothash
+ConditionKernelCommandLine=!root


I think this would break multipath, where currently you have to put the root karg at install time but we do still want the restamping. Is this actually required for bootc? The service will run but the script should no-op if the filesystem UUID was already randomized.

Similarly for coreos-gpt-setup.service.

jlebon · 2023-01-19T21:10:19Z

overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-setup-user.sh

+}
+
+# This is copied from coreos-boot-mount-generator which we should likely run
+# in the initramfs too


Yeah, I think that'd be a safer path. This seems to be trying to undo the assumption that /dev/disk/by-label/boot points to our boot disk at first boot, but only for one service, whereas it's an assumption embedded all over the place. The generator could put the found device in e.g. /run/coreos/bootdev?

jlebon · 2023-01-19T21:10:59Z

overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-setup-user.sh

+        *) echo "Unknown boot karg '${bootkarg}'; falling back to ${bootdev}";;
+    esac
+# This is used for the first boot only
+elif [ -f /run/coreos/bootfs_uuid ]; then


This is written by coreos-boot-edit and isn't relevant here.

cgwalters · 2023-11-06T22:05:20Z

For now, won't be targeting FCOS with bootc install.

cgwalters mentioned this pull request Jan 2, 2023

Add an install command containers/bootc#30

Merged

cgwalters marked this pull request as draft January 3, 2023 23:17

cgwalters force-pushed the boot-idempotent branch from c3b40d2 to 5ecb25b Compare January 10, 2023 20:56

cgwalters added 4 commits January 17, 2023 15:15

dracut/boot-edit: Do nothing if we have a boot= karg

6f7197a

In this case, we shouldn't have anything to do. This is needed for `bootc install` which currently sets up these kargs in advance. containers/bootc#30

dracut/ignition-setup: Use boot= karg if it exists

df01601

This will be used with bootc which will default to injecting a karg for `boot`.

ignition-uuid-root: no-op if we already have a root= karg

7b4d459

For bootc compatibility.

overlay: More no-ops if we have a boot= and/or root= karg

d01094a

We can assume the disk image is already set up in this case.

cgwalters force-pushed the boot-idempotent branch from 5ecb25b to d01094a Compare January 17, 2023 20:16

cgwalters marked this pull request as ready for review January 17, 2023 20:16

cgwalters commented Jan 17, 2023

View reviewed changes

cgwalters changed the title ~~Make handling of boot= karg idempotent~~ Make handling of boot= and root= kargs idempotent Jan 17, 2023

jlebon reviewed Jan 19, 2023

View reviewed changes

cgwalters added the bootc bootc compatibility label Mar 20, 2023

cgwalters mentioned this pull request Mar 23, 2023

Tracker for bootc integration coreos/fedora-coreos-tracker#1446

Open

cgwalters added the area/container-native Work related to moving FCOS to be container-native label Sep 19, 2023

cgwalters closed this Nov 6, 2023

cgwalters mentioned this pull request Nov 13, 2023

Relationship with https://github.com/osbuild/osbuild/pull/1402 osbuild/bootc-image-builder#4

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make handling of `boot=` and `root=` kargs idempotent #2141

Make handling of `boot=` and `root=` kargs idempotent #2141

cgwalters commented Jan 2, 2023 •

edited

Loading

jlebon commented Jan 3, 2023

cgwalters commented Jan 3, 2023

cgwalters commented Jan 17, 2023

cgwalters Jan 17, 2023

cgwalters commented Jan 18, 2023

dustymabe commented Jan 19, 2023

jlebon left a comment

jlebon Jan 19, 2023

jlebon Jan 19, 2023

jlebon Jan 19, 2023

cgwalters commented Nov 6, 2023

Make handling of boot= and root= kargs idempotent #2141

Make handling of boot= and root= kargs idempotent #2141

Conversation

cgwalters commented Jan 2, 2023 • edited Loading

jlebon commented Jan 3, 2023

cgwalters commented Jan 3, 2023

cgwalters commented Jan 17, 2023

cgwalters Jan 17, 2023

Choose a reason for hiding this comment

cgwalters commented Jan 18, 2023

dustymabe commented Jan 19, 2023

jlebon left a comment

Choose a reason for hiding this comment

jlebon Jan 19, 2023

Choose a reason for hiding this comment

jlebon Jan 19, 2023

Choose a reason for hiding this comment

jlebon Jan 19, 2023

Choose a reason for hiding this comment

cgwalters commented Nov 6, 2023

Make handling of `boot=` and `root=` kargs idempotent #2141

Make handling of `boot=` and `root=` kargs idempotent #2141

cgwalters commented Jan 2, 2023 •

edited

Loading