From f8a73e018b9690a8c6f0c5ce05c367d6bb59bb66 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 10 Apr 2019 02:13:24 +0000 Subject: [PATCH] Move fs.Context to types.go This config struct is now used in the plugin InitializeContext method, so it should be defined in the os-neutral types.go file --- fs/fs.go | 17 ----------------- fs/types.go | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fs/fs.go b/fs/fs.go index a7542158..269e914f 100644 --- a/fs/fs.go +++ b/fs/fs.go @@ -91,23 +91,6 @@ type RealFsInfo struct { fsUUIDToDeviceName map[string]string } -type Context struct { - // docker root directory. - Docker DockerContext - RktPath string - Crio CrioContext -} - -type DockerContext struct { - Root string - Driver string - DriverStatus map[string]string -} - -type CrioContext struct { - Root string -} - func NewFsInfo(context Context) (FsInfo, error) { mounts, err := mount.GetMounts(nil) if err != nil { diff --git a/fs/types.go b/fs/types.go index 5074f713..0deaa780 100644 --- a/fs/types.go +++ b/fs/types.go @@ -18,6 +18,23 @@ import ( "errors" ) +type Context struct { + // docker root directory. + Docker DockerContext + RktPath string + Crio CrioContext +} + +type DockerContext struct { + Root string + Driver string + DriverStatus map[string]string +} + +type CrioContext struct { + Root string +} + type DeviceInfo struct { Device string Major uint