WIP: Fix ostree install during bootc container build#1671
Draft
tristandruyen wants to merge 5 commits intoDeterminateSystems:mainfrom
Draft
WIP: Fix ostree install during bootc container build#1671tristandruyen wants to merge 5 commits intoDeterminateSystems:mainfrom
tristandruyen wants to merge 5 commits intoDeterminateSystems:mainfrom
Conversation
- Rename file `start_systemd_unit.rs` to `start_or_enable_systemd_unit.rs` - Update struct definition to include `start` boolean flag - Modify implementation to handle both enable and start operations - Update fixtures to use new action name - Update all references in planner modules to use the new action type
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
- Add `init` field to `Ostree` struct with `InitSettings` type - Replace hardcoded start bool with `self.init.start_daemon` in multiple methods - Add conditional check in pre_uninstall and _install from linux planner - Update `settings` collection to include `init` settings
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Similar previous PR: #1646
Resolves: #1645
Context
This PR tries to get the underlying use-case behind #1645 resolved, which is to run the installer in a bootc container build.
While systemd isn't running during the install, we still want to enable all the systemd stuff so it works with systemd once booted for "real".
Bootc also seems to break some other assumptions the installer makes, most notably
/root&/usr/localare simlinks to/var.What I did so far
Status
nix runopen questions
--no-start-daemonis set, but that's obviously the wrong approach, might need an extra arg like--skip-daemon-reloadDETERMINATE_NIXD_BINARY_PATH& roots$HOMEcause issues as bootc containers have a simlink from/usr/localto/var/usrlocal&/rootto/var/roothome--nixd-binary-path&& `--StartOrEnableSystemdUnitfeels suboptimal, is there a better name or should this just be split into 2 actions?/var/nixto be populated, and/varis only copied over during install, this could be left as an exercise to the image builder to migrate somehow....I am open to clean it up once the above design decisions have an answer from maintainers.
Checklist
cargo fmtnix buildnix flake checkValidating with
install.determinate.systemsIf a maintainer has added the
upload to s3label to this PR, it will become available for installation viainstall.determinate.systems: