Skip to content

AddMounts should be AddMount you are only adding a single Mount #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhouhao3 merged 1 commit into from
Dec 18, 2017
Merged

AddMounts should be AddMount you are only adding a single Mount #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cmd/oci-runtime-tool/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"bufio"
"bytes"
"encoding/json"
"fmt"
"os"
"strconv"
Expand Down Expand Up @@ -427,8 +428,11 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
if context.IsSet("mounts-add") {
mounts := context.StringSlice("mounts-add")
for _, mount := range mounts {
err := g.AddMounts(mount)
if err != nil {
mnt := rspec.Mount{}
if err := json.Unmarshal([]byte(mount), &mnt); err != nil {
return err
}
if err := g.AddMount(mnt); err != nil {
return err
}
}
Expand Down
9 changes: 2 additions & 7 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,15 +980,10 @@ func (g *Generator) AddPostStartHook(hookObject string) error {
return nil
}

// AddMounts adds a mount into g.spec.Mounts.
func (g *Generator) AddMounts(mountObject string) error {
// AddMount adds a mount into g.spec.Mounts.
func (g *Generator) AddMount(mnt rspec.Mount) error {
g.initSpec()

mnt := rspec.Mount{}
err := json.Unmarshal([]byte(mountObject), &mnt)
if err != nil {
return err
}
g.spec.Mounts = append(g.spec.Mounts, mnt)

return nil
Expand Down