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

chroot/sd_notify() fixes #18329

Merged
merged 3 commits into from
Jan 21, 2021
Merged

chroot/sd_notify() fixes #18329

merged 3 commits into from
Jan 21, 2021

Conversation

poettering
Copy link
Member

A fix for #18051

…= work

Previously if people enabled RootDirectory=/RootImage= and NotifyAccess=
together, things wouldn't work, they'd have to explicitly add
BindReadOnlyPaths=/run/systemd/notify too.

Let's make this implicit. Since both options are opt-in, if people use
them together it would be pointless not also defining the
BindReadOnlyPaths= entry, in which case we can just do it automatically.

See: systemd#18051
MountAPIVFS= implicitly mounts /run as tmpfs now, no need to do this
explicitly.

The notification socket is now implicitly mounted too, if NotifyAccess=
and RootImage=/RootDirectory= are used together.
@poettering poettering added documentation pid1 portable Anything to do with systemd-portable and portablectl and portables labels Jan 20, 2021
@poettering poettering linked an issue Jan 20, 2021 that may be closed by this pull request
@yuwata
Copy link
Member

yuwata commented Jan 21, 2021

LGTM.

@yuwata yuwata added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jan 21, 2021
@yuwata yuwata merged commit 33f7b61 into systemd:master Jan 21, 2021
poettering added a commit to poettering/systemd that referenced this pull request Jan 21, 2021
This partly reverts fe239c7, where I
accidentally dropped only line for /run that was unlike the others.
Oops.

@bluca, thanks for noticing:

systemd#18329 (review)
bluca pushed a commit that referenced this pull request Jan 21, 2021
This partly reverts fe239c7, where I
accidentally dropped only line for /run that was unlike the others.
Oops.

@bluca, thanks for noticing:

#18329 (review)
borna-blazevic pushed a commit to sartura/systemd that referenced this pull request Mar 1, 2021
This partly reverts fe239c7, where I
accidentally dropped only line for /run that was unlike the others.
Oops.

@bluca, thanks for noticing:

systemd#18329 (review)
borna-blazevic pushed a commit to sartura/systemd that referenced this pull request Mar 1, 2021
This partly reverts fe239c7, where I
accidentally dropped only line for /run that was unlike the others.
Oops.

@bluca, thanks for noticing:

systemd#18329 (review)
borna-blazevic pushed a commit to sartura/systemd that referenced this pull request Mar 1, 2021
This partly reverts fe239c7, where I
accidentally dropped only line for /run that was unlike the others.
Oops.

@bluca, thanks for noticing:

systemd#18329 (review)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed pid1 portable Anything to do with systemd-portable and portablectl and portables
Development

Successfully merging this pull request may close these issues.

sd_notify and sd_journal_* not working inside chroot
4 participants