Skip to content

Use moby/sys/mountinfo#131

Merged
AkihiroSuda merged 1 commit intorootless-containers:masterfrom
kolyshkin:use-sys-mountinfo
Mar 17, 2020
Merged

Use moby/sys/mountinfo#131
AkihiroSuda merged 1 commit intorootless-containers:masterfrom
kolyshkin:use-sys-mountinfo

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Mar 17, 2020

(this is a followup to #122)

Drop the implementation forked from runc, use moby/sys/mountinfo.

Use SingleEntryFilter as we're only interested in / mount.

NOTE we're no longer checking for m.Root == "/", only for
the mount point.

@kolyshkin
Copy link
Copy Markdown
Contributor Author

@AkihiroSuda @thaJeztah PTAL

@kolyshkin
Copy link
Copy Markdown
Contributor Author

Can't figure out why CI fails :(

logrus.Warn("Failed to parse mountinfo of the root filesystem")
return
}
root = mounts[0]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# github.com/rootless-containers/rootlesskit/pkg/parent
src/github.com/rootless-containers/rootlesskit/pkg/parent/warn.go:18:2: undefined: root
src/github.com/rootless-containers/rootlesskit/pkg/parent/warn.go:23:68: undefined: root
src/github.com/rootless-containers/rootlesskit/pkg/parent/warn.go:25:4: undefined: root

@AkihiroSuda
Copy link
Copy Markdown
Member

Thanks, LGTM except the compilation failure

Drop the implementation forked from runc, use moby/sys/mountinfo.

Use SingleEntryFilter as we're only interested in / mount.

NOTE we're no longer checking for m.Root == "/", only for
the mount point.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
Copy link
Copy Markdown
Contributor Author

oops, fixed

@AkihiroSuda AkihiroSuda merged commit c53ae22 into rootless-containers:master Mar 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants