-
Notifications
You must be signed in to change notification settings - Fork 321
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use passwd symlinks instead of bind mounts #3200
Merged
Merged
+87
−24
Conversation
This file contains 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
DaanDeMeyer
force-pushed
the
passwd-symlink
branch
6 times, most recently
from
November 17, 2024 15:20
db3a071
to
e152982
Compare
DaanDeMeyer
force-pushed
the
passwd-symlink
branch
from
November 17, 2024 15:33
e152982
to
690a1ab
Compare
behrmann
reviewed
Nov 17, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo in the second commit message, otherwise LGTM.
@@ -3166,6 +3167,14 @@ def parse_ini(path: Path, only_sections: Collection[str] = ()) -> Iterator[tuple | |||
parse=config_make_list_parser(delimiter=","), | |||
help="Add additional packages to the default tools tree", | |||
), | |||
ConfigSetting( | |||
dest="tools_tree_package_directories", | |||
long="--tools-tree-package-directory", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Depending on the direction of #3201, this should maybe be --tools-tree-package-dir
.
With the new mount API, we can mount on top of existing symlinks and files, so let's make use of that for --symlink.
Bind mounts don't reflect changes to the original files if they're replaced instead of modified. Let's use symlinks instead so that changes to the original files are always reflected. Fixes systemd#3189
Sometimes, we want to add locally built rpm packages to the default tools tree. For example, systemd-repart depends on mkfs binaries that might not be available on the host system, so the only way to run it is from within the tools tree, which means we need a way to install systemd-repart built from source within the tools tree.
If bootctl 257 or newer is installed, we don't use sbsigntools anymore so don't require it in that case.
Required for signing with openssl pkcs11 provider.
DaanDeMeyer
force-pushed
the
passwd-symlink
branch
from
November 17, 2024 16:29
690a1ab
to
aa56f90
Compare
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.
Bind mounts don't reflect changes to the original files if they're
replaced instead of modified. Let's use symlinks instead so that
changes to the original files are always reflected.
Fixes #3189