diff options
| author | Jhon Honce <jhonce@redhat.com> | 2019-03-05 16:11:28 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2019-04-09 11:55:26 -0700 |
| commit | 09ff62429a324e01ad2c584afe9a5f66f580ae78 (patch) | |
| tree | 6c896a4071b4c0df0d6ae4f95f171b6596d4367a /libpod/container_internal.go | |
| parent | fe79bdd07e140176dc64ebef8da3eea2ae28b96b (diff) | |
| download | podman-09ff62429a324e01ad2c584afe9a5f66f580ae78.tar.gz podman-09ff62429a324e01ad2c584afe9a5f66f580ae78.tar.bz2 podman-09ff62429a324e01ad2c584afe9a5f66f580ae78.zip | |
Implement podman-remote rm
* refactor command output to use one function
* Add new worker pool parallel operations
* Implement podman-remote umount
* Refactored podman wait to use printCmdOutput()
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 22df36c11..3c7319963 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -948,7 +948,7 @@ func (c *Container) start() error { // Internal, non-locking function to stop container func (c *Container) stop(timeout uint) error { - logrus.Debugf("Stopping ctr %s with timeout %d", c.ID(), timeout) + logrus.Debugf("Stopping ctr %s (timeout %d)", c.ID(), timeout) if err := c.runtime.ociRuntime.stopContainer(c, timeout); err != nil { return err @@ -1064,14 +1064,16 @@ func (c *Container) mountStorage() (string, error) { func (c *Container) cleanupStorage() error { if !c.state.Mounted { // Already unmounted, do nothing - logrus.Debugf("Storage is already unmounted, skipping...") + logrus.Debugf("Container %s storage is already unmounted, skipping...", c.ID()) return nil } + for _, mount := range c.config.Mounts { if err := c.unmountSHM(mount); err != nil { return err } } + if c.config.Rootfs != "" { return nil } |