This repository has been archived by the owner on Aug 6, 2020. It is now read-only.
umount: Don't use options from fstab on remount #22
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
The fstab entry may contain comment/application-specific options, like for example x-systemd.automount or x-initrd.mount. With the recent switch to libmount, the mount options during remount are now gathered via mnt_fs_get_options(), which returns the merged fstab options with the effective options in mountinfo. Unfortunately if one of these application-specific options are set in fstab, the remount will fail with -EINVAL. In systemd 238: Remounting '/test-x-initrd-mount' read-only in with options 'errors=continue,user_xattr,acl'. In systemd 239: Remounting '/test-x-initrd-mount' read-only in with options 'errors=continue,user_xattr,acl,x-initrd.mount'. Failed to remount '/test-x-initrd-mount' read-only: Invalid argument So instead of using mnt_fs_get_options(), we're now using both mnt_fs_get_fs_options() and mnt_fs_get_vfs_options() and merging the results together so we don't get any non-relevant options from fstab. Signed-off-by: aszlig <aszlig@nix.build> (cherry picked from commit 66c91c3)
|
cc @globin |
|
Do we have other commits in master that are worth a backport, while we are at it? |
|
Here they reverted some kernel tunables for ECN: systemd@1e190df (originally systemd#9880) There has been also an low-severity security issue with mount namespaces and fuse: systemd#9848 systemd#9852 I probably should backport those in different pull requests. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This has been merged upstream at via pull request systemd#9886 and it fixes the
systemdNixOS test (and of course also remounting of filesystems with application-specific mount options).Text of the original pull request:
This is a cherry-pick of the commit that landed in the upstream
masterbranch.Cc: @edolstra, @fpletz, @Mic92