Skip to content
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 10 commits into from
Nov 17, 2024

Conversation

DaanDeMeyer
Copy link
Contributor

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

@DaanDeMeyer DaanDeMeyer force-pushed the passwd-symlink branch 6 times, most recently from db3a071 to e152982 Compare November 17, 2024 15:20
Copy link
Contributor

@behrmann behrmann left a 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",
Copy link
Contributor

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 DaanDeMeyer merged commit 5182007 into systemd:main Nov 17, 2024
30 of 36 checks passed
@DaanDeMeyer DaanDeMeyer deleted the passwd-symlink branch November 17, 2024 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Ubuntu 24.04 images fail to build
2 participants