diff options
| -rw-r--r-- | cmd/podman/common.go | 12 | ||||
| -rw-r--r-- | cmd/podman/main.go | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 4b268dfff..5e670dcc8 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -14,10 +14,6 @@ import ( "github.com/urfave/cli" ) -var ( - stores = make(map[storage.Store]struct{}) -) - const crioConfigPath = "/etc/crio/crio.conf" func getRuntime(c *cli.Context) (*libpod.Runtime, error) { @@ -36,14 +32,6 @@ func getRuntime(c *cli.Context) (*libpod.Runtime, error) { return libpod.NewRuntime(libpod.WithStorageConfig(options), libpod.WithConmonPath(config.Conmon), libpod.WithOCIRuntime(config.Runtime), libpod.WithCNIConfigDir(config.NetworkDir)) } -func shutdownStores() { - for store := range stores { - if _, err := store.Shutdown(false); err != nil { - break - } - } -} - func getConfig(c *cli.Context) (*libkpod.Config, error) { config := libkpod.DefaultConfig() var configFile string diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 011303349..b27409e4c 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -98,17 +98,11 @@ func main() { } app.After = func(*cli.Context) error { // called by Run() when the command handler succeeds - shutdownStores() if cpuProfile { pprof.StopCPUProfile() } return nil } - cli.OsExiter = func(code int) { - // called by Run() when the command fails, bypassing After() - shutdownStores() - os.Exit(code) - } app.Flags = []cli.Flag{ cli.StringFlag{ Name: "cni-config-dir", @@ -158,6 +152,5 @@ func main() { } else { fmt.Fprintln(os.Stderr, err.Error()) } - cli.OsExiter(1) } } |