Skip to content
This repository has been archived by the owner on Aug 6, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/systemd
base: 67c553805a9e
Choose a base ref
...
head repository: NixOS/systemd
compare: 21efe60844fd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 22, 2018

  1. umount: Don't use options from fstab on remount 

    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)
    @aszlig @globin
    aszlig authored and globin committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    21efe60 View commit details
    Browse the repository at this point in the history