diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-24 17:46:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 17:46:20 +0200 |
| commit | 3c3adac52838bc4d2b0fdda2cbb8366c81444728 (patch) | |
| tree | e8f2c7807a36403a1ffef16a8147a1448e4a2221 /pkg/specgen/specgen.go | |
| parent | dcb99f5315eea27f9cc8720937ae2f5c272a6a00 (diff) | |
| parent | 3eeb03d1f970478961acf21cecfdf90d5a75043f (diff) | |
| download | podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.tar.gz podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.tar.bz2 podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.zip | |
Merge pull request #5967 from giuseppe/run-test-fixes
v2, tests: fix various run_test.go failures
Diffstat (limited to 'pkg/specgen/specgen.go')
| -rw-r--r-- | pkg/specgen/specgen.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 37f2b3190..275af1f49 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -402,8 +402,13 @@ type NamedVolume struct { } // NewSpecGenerator returns a SpecGenerator struct given one of two mandatory inputs -func NewSpecGenerator(image string) *SpecGenerator { - csc := ContainerStorageConfig{Image: image} +func NewSpecGenerator(arg string, rootfs bool) *SpecGenerator { + csc := ContainerStorageConfig{} + if rootfs { + csc.Rootfs = arg + } else { + csc.Image = arg + } return &SpecGenerator{ ContainerStorageConfig: csc, } |