summaryrefslogtreecommitdiff
path: root/cmd/kpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-11-25 09:37:50 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-27 14:22:47 +0000
commit548f1516dedbd9574f624967d7022d52eb4d6c13 (patch)
treee031fd855de923552dcffbf6dedc54c713d621ee /cmd/kpod
parentb1a3b030688e28e6d7473d998cabbf923a8064f9 (diff)
downloadpodman-548f1516dedbd9574f624967d7022d52eb4d6c13.tar.gz
podman-548f1516dedbd9574f624967d7022d52eb4d6c13.tar.bz2
podman-548f1516dedbd9574f624967d7022d52eb4d6c13.zip
kpod run, needs to shutdown the storage driver when done
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #73 Approved by: mheon
Diffstat (limited to 'cmd/kpod')
-rw-r--r--cmd/kpod/create.go2
-rw-r--r--cmd/kpod/run.go3
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/kpod/create.go b/cmd/kpod/create.go
index 9e4162993..2684f8927 100644
--- a/cmd/kpod/create.go
+++ b/cmd/kpod/create.go
@@ -149,6 +149,7 @@ func createCmd(c *cli.Context) error {
if err != nil {
return errors.Wrapf(err, "error creating libpod runtime")
}
+ defer runtime.Shutdown(false)
createConfig, err := parseCreateOpts(c, runtime)
if err != nil {
@@ -169,7 +170,6 @@ func createCmd(c *cli.Context) error {
if err != nil {
return err
}
- defer runtime.Shutdown(false)
if createImage.LocalName != "" {
imageName = createImage.LocalName
} else {
diff --git a/cmd/kpod/run.go b/cmd/kpod/run.go
index 35e2d0be7..275654f65 100644
--- a/cmd/kpod/run.go
+++ b/cmd/kpod/run.go
@@ -28,10 +28,10 @@ func runCmd(c *cli.Context) error {
return err
}
runtime, err := getRuntime(c)
-
if err != nil {
return errors.Wrapf(err, "error creating libpod runtime")
}
+ defer runtime.Shutdown(false)
createConfig, err := parseCreateOpts(c, runtime)
if err != nil {
@@ -51,7 +51,6 @@ func runCmd(c *cli.Context) error {
if err != nil {
return err
}
- defer runtime.Shutdown(false)
logrus.Debug("spec is ", runtimeSpec)
if createImage.LocalName != "" {