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

tmpfiles: v/q/Q: Add env var to skip check for rootfs in subvolume #18522

Merged
merged 1 commit into from Feb 10, 2021
Merged

tmpfiles: v/q/Q: Add env var to skip check for rootfs in subvolume #18522

merged 1 commit into from Feb 10, 2021

Conversation

AdrianVovk
Copy link
Contributor

@AdrianVovk AdrianVovk commented Feb 9, 2021

Fixes #18502

I've compiled this into my distro and it fixes the problem. I also tested it on ext4 with the variable set and it fell back to directories just fine. Without the variable, it behaves just as before

src/tmpfiles/tmpfiles.c Outdated Show resolved Hide resolved
@poettering poettering added the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label Feb 9, 2021
@AdrianVovk
Copy link
Contributor Author

Oh that makes a lot more sense! I didn't realize that btrfs_subvol_make_fd failes with ENOTTY on other filesystems. I made the changes, and I'm building an image of my OS to test that it still works right now. I'll let you know how it goes

@AdrianVovk
Copy link
Contributor Author

@poettering I tested it. It all works, the only nitpick is the warning that shows up when the env variable is unset (which is 99% of the time)

@bluca
Copy link
Member

bluca commented Feb 10, 2021

@poettering I tested it. It all works, the only nitpick is the warning that shows up when the env variable is unset (which is 99% of the time)

Maybe loginfo or logdebug would be better then?

src/tmpfiles/tmpfiles.c Show resolved Hide resolved
src/tmpfiles/tmpfiles.c Outdated Show resolved Hide resolved
docs/ENVIRONMENT.md Outdated Show resolved Hide resolved
@AdrianVovk
Copy link
Contributor Author

@poettering I've made the changes you requested

@bluca bluca removed the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label Feb 10, 2021
@poettering poettering 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 Feb 10, 2021
@poettering
Copy link
Member

lgtm

@poettering poettering merged commit 4368c60 into systemd:main Feb 10, 2021
@AdrianVovk AdrianVovk deleted the tmpfiles-skip-subvol-check branch February 11, 2021 06:45
@AdrianVovk
Copy link
Contributor Author

Thank you :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation 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 tmpfiles
Development

Successfully merging this pull request may close these issues.

tmpfiles.d support creating btrfs subvolumes on ostree systems
3 participants