compose: Add boot-location: modules
#1773
Conversation
| @@ -50,7 +50,6 @@ | |||
| #include "rpmostree-rust.h" | |||
|
|
|||
| typedef enum { | |||
| RPMOSTREE_POSTPROCESS_BOOT_LOCATION_BOTH, | |||
| RPMOSTREE_POSTPROCESS_BOOT_LOCATION_NEW | |||
| } RpmOstreePostprocessBootLocation; | |||
There was a problem hiding this comment.
We can just drop this enum completely now, right?
There was a problem hiding this comment.
Yes but I have a followup PR to add boot-location: modules 😄
There was a problem hiding this comment.
Ahh gotcha! Maybe just a one-liner in the commit msg this is prep for a new variant?
I'd like to add a new `boot-location: modules`. In prep for that, let's remove the legacy `both` which drops into `/boot`. The libostree support for handling `/usr/lib/ostree-boot` has existed for over 4 years: ``` commit 37a0599 Commit: Colin Walters <[email protected]> CommitDate: Sun Nov 30 23:14:05 2014 -0500 deploy: Ensure that we can deploy using only /usr/lib/ostree-boot ``` I think we assume now that no one is now making *new* treecomposes and needs a newer rpm-ostree and that they expect people to be able to use as an upgrade target from a libostree that predates that.
cgwalters
force-pushed
the
bootloc-cleanup
branch
from
656284b to
9aa9f9f
Compare
cgwalters
changed the title
boot-location: modules
|
sorry, but what is the benefits of using boot_location: modules vs new? |
See the commit message -
|
|
@cgwalters ah thanks! i miss this commit message. |
docs/manual/treefile.md
Outdated
| * "new": A misnomer, this value is no longer "new". Kernel data | ||
| goes in `/usr/lib/ostree-boot` in addition to `/usr/lib/modules`. | ||
| This is the default. | ||
| * "modules": Kernel data goes just in `/usr/lib/modules` |
| EOF | ||
| diff -u bootls{-expected,}.txt | ||
| # Verify /usr/lib/ostree-boot | ||
| ostree --repo=${repobuild} ls -R ${treeref} /usr/lib/ostree-boot > bootls.txt |
There was a problem hiding this comment.
Minor: do we even need the directory to exist at all? It'd be cleaner to not even have it at all, no?
There was a problem hiding this comment.
For systems installed by Anaconda it's where the bootloader data lives.
For FCOS...we could actually inject it statically into /boot and drop it from the tree. That'd have to be a new config option...
There was a problem hiding this comment.
Or really it'd have to be like compose tree --bootdir=$(pwd)/tmp/boot and then we change cosa to drop that stuff in the disk image's /boot - after we stop using Anaconda.
There was a problem hiding this comment.
Related ostreedev/ostree#717 (comment)
and #969
And this (for now at least) completes the epic journey of the "where's the kernel"? With this it's found solely in `/usr/lib/modules/$kver`. There are a few reasons to do this; most prominent is that it avoids duplicating the content as the locations may have different SELinux labels.
cgwalters
force-pushed
the
bootloc-cleanup
branch
from
9aa9f9f to
08acff6
Compare
And this (for now at least) completes the epic journey of the "where's the kernel"? With this it's found solely in `/usr/lib/modules/$kver`. There are a few reasons to do this; most prominent is that it avoids duplicating the content as the locations may have different SELinux labels. Closes: #1773 Approved by: jlebon
|
☀️ Test successful - status-atomicjenkins |
The libostree support for handling
/usr/lib/ostree-boothasexisted for over 4 years:
I think we assume now that no one is now making new treecomposes and needs
a newer rpm-ostree and that they expect people to be able to use as an
upgrade target from a libostree that predates that.