nixos/systemd: make sure all the device nodes are created in stage1#182436
Merged
flokli merged 1 commit intoNixOS:stagingfrom Jul 22, 2022
Merged
nixos/systemd: make sure all the device nodes are created in stage1#182436flokli merged 1 commit intoNixOS:stagingfrom
flokli merged 1 commit intoNixOS:stagingfrom
Conversation
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system. Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
github-actions
bot
added
6.topic: nixos
13 tasks
Contributor
Author
|
I'm not sure if the patch format change is a good idea, but it should reduce the diff noise next time the patchset is rebased. |
arianvp
approved these changes
Jul 22, 2022
ofborg
bot
added
10.rebuild-darwin: 101-500
Member
|
I'll let flokli decide about the patch format changes |
flokli
reviewed
Jul 22, 2022
| # `git am path/to/00*.patch` them into a systemd worktree, rebase to the more recent | ||
| # systemd version, and export the patches again via `git -c format.signoff=false format-patch v${version}`. | ||
| # systemd version, and export the patches again via | ||
| # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`. |
flokli
approved these changes
Jul 22, 2022
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
3 participants
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 of changes
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system.
Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
Also, use some git tricks to normalize patches harder for optimal diffability.
Respin of #179693 which was retargeted wrong.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes