diff options
| author | Joseph Richey <joerichey@google.com> | 2019-10-30 22:49:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 22:49:40 +0100 |
| commit | 9b2f1c37fc881d7e991cf0b8abab662d4bf9055c (patch) | |
| tree | c41774c7422e3cb5e55a753c79d4c45fe3692501 /actions | |
| parent | a3434e41bd482fc1b35703f66c24c9d1ec3b0be2 (diff) | |
| parent | e71c5e4f70632b99a08d127b35e80a9e291e1938 (diff) | |
Merge pull request #154 from ebiggers/bind-mounts
Store fscrypt metadata in only one place per filesystem, so that bind
mounts don't get their own metadata directories (which was ambiguous,
as the same file may be accessible via multiple mounts).
Also correctly set the source device for root filesystems mounted via
the kernel command line, and fix creating linked protectors to such
filesystems.
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/context.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/context.go b/actions/context.go index 4a8542b..830ad03 100644 --- a/actions/context.go +++ b/actions/context.go @@ -78,7 +78,7 @@ func NewContextFromPath(path string, target *user.User) (*Context, error) { } log.Printf("%s is on %s filesystem %q (%s)", path, - ctx.Mount.Filesystem, ctx.Mount.Path, ctx.Mount.Device) + ctx.Mount.FilesystemType, ctx.Mount.Path, ctx.Mount.Device) return ctx, nil } @@ -95,7 +95,7 @@ func NewContextFromMountpoint(mountpoint string, target *user.User) (*Context, e return nil, err } - log.Printf("found %s filesystem %q (%s)", ctx.Mount.Filesystem, + log.Printf("found %s filesystem %q (%s)", ctx.Mount.FilesystemType, ctx.Mount.Path, ctx.Mount.Device) return ctx, nil } @@ -137,9 +137,9 @@ func (ctx *Context) checkContext() error { func (ctx *Context) getService() string { // For legacy configurations, we may need non-standard services if ctx.Config.HasCompatibilityOption(LegacyConfig) { - switch ctx.Mount.Filesystem { + switch ctx.Mount.FilesystemType { case "ext4", "f2fs": - return ctx.Mount.Filesystem + ":" + return ctx.Mount.FilesystemType + ":" } } return unix.FS_KEY_DESC_PREFIX |