From 212efa578a2bdd0e3686acb4a1cfd5ae27360fef Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 15 Mar 2017 16:13:15 -0700 Subject: [PATCH] Remove get function from rootfs The service can use the snapshotter directly to get the rootfs. Removed debug line for mount response. Signed-off-by: Derek McGowan (github: dmcgowan) --- cmd/dist/rootfs.go | 1 - rootfs/init.go | 4 ---- services/rootfs/service.go | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmd/dist/rootfs.go b/cmd/dist/rootfs.go index bff3271..ca4e40e 100644 --- a/cmd/dist/rootfs.go +++ b/cmd/dist/rootfs.go @@ -110,7 +110,6 @@ var rootfsInitCommand = cli.Command{ for _, m := range resp.Mounts { fmt.Fprintf(os.Stdout, "mount -t %s %s %s -o %s\n", m.Type, m.Source, target, strings.Join(m.Options, ",")) } - log.G(ctx).Infof("Mount response: %#v", resp) return nil }, diff --git a/rootfs/init.go b/rootfs/init.go index ebcae81..4acbf7e 100644 --- a/rootfs/init.go +++ b/rootfs/init.go @@ -44,10 +44,6 @@ func InitRootFS(ctx context.Context, name string, parent digest.Digest, readonly return snapshotter.Prepare(ctx, name, parentS) } -func GetRootFS(ctx context.Context, name string, snapshotter snapshot.Snapshotter) ([]containerd.Mount, error) { - return snapshotter.Mounts(ctx, name) -} - func createInitLayer(ctx context.Context, parent, initName string, initFn func(string) error, snapshotter snapshot.Snapshotter, mounter Mounter) (string, error) { initS := fmt.Sprintf("%s %s", parent, initName) if _, err := snapshotter.Stat(ctx, initS); err == nil { diff --git a/services/rootfs/service.go b/services/rootfs/service.go index 362b526..21c98ca 100644 --- a/services/rootfs/service.go +++ b/services/rootfs/service.go @@ -75,7 +75,7 @@ func (s *Service) Prepare(ctx context.Context, ir *rootfsapi.PrepareRequest) (*r } func (s *Service) Mounts(ctx context.Context, mr *rootfsapi.MountsRequest) (*rootfsapi.MountResponse, error) { - mounts, err := rootfs.GetRootFS(ctx, mr.Name, s.snapshotter) + mounts, err := s.snapshotter.Mounts(ctx, mr.Name) if err != nil { return nil, err }