vbatts
/
containerd
1
0
Fork 0
Code Pull Requests Releases Activity

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 <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2017-03-15 16:13:15 -07:00
parent b1bc82726f
commit 212efa578a
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/dist/rootfs.go vendored
View File

@ -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
},

4
rootfs/init.go
View File

@ -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 {

2
services/rootfs/service.go
View File

@ -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
}