opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove ability to specify mount label when mounting

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #506
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-03-15 17:09:31 -04:00
committed by Atomic Bot
parent eb33cc2193
commit 8840b92da6
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/mount.go
View File

@ -79,7 +79,7 @@ func mountCmd(c *cli.Context) error {
if err != nil { if err != nil {
return errors.Wrapf(err, "error looking up container %q", args[0]) return errors.Wrapf(err, "error looking up container %q", args[0])
} }
mountPoint, err := ctr.Mount(ctr.MountLabel()) mountPoint, err := ctr.Mount()
if err != nil { if err != nil {
return errors.Wrapf(err, "error mounting container %q", ctr.ID()) return errors.Wrapf(err, "error mounting container %q", ctr.ID())
} }

1
completions/bash/podman
View File

@ -1000,7 +1000,6 @@ _podman_mount() {
" "
local options_with_args=" local options_with_args="
--label
--format --format
" "

27
libpod/container_api.go
View File

@ -368,7 +368,7 @@ func (c *Container) Attach(noStdin bool, keys string) error {
// Mount mounts a container's filesystem on the host // Mount mounts a container's filesystem on the host
// The path where the container has been mounted is returned // The path where the container has been mounted is returned
func (c *Container) Mount(label string) (string, error) { func (c *Container) Mount() (string, error) {
if !c.locked { if !c.locked {
c.lock.Lock() c.lock.Lock()
defer c.lock.Unlock() defer c.lock.Unlock()
@ -378,27 +378,11 @@ func (c *Container) Mount(label string) (string, error) {
} }
} }
// return mountpoint if container already mounted if err := c.mountStorage(); err != nil {
if c.state.Mounted {
return c.state.Mountpoint, nil
}
mountLabel := label
if label == "" {
mountLabel = c.config.MountLabel
}
mountPoint, err := c.runtime.store.Mount(c.ID(), mountLabel)
if err != nil {
return "", err
}
c.state.Mountpoint = mountPoint
c.state.Mounted = true
if err := c.save(); err != nil {
return "", err return "", err
} }
return mountPoint, nil return c.state.Mountpoint, nil
} }
// Unmount unmounts a container's filesystem on the host // Unmount unmounts a container's filesystem on the host
@ -416,6 +400,11 @@ func (c *Container) Unmount() error {
return errors.Wrapf(ErrCtrStateInvalid, "cannot remove storage for container %s as it is running or paused", c.ID()) return errors.Wrapf(ErrCtrStateInvalid, "cannot remove storage for container %s as it is running or paused", c.ID())
} }
// Check if we have active exec sessions
if len(c.state.ExecSessions) != 0 {
return errors.Wrapf(ErrCtrStateInvalid, "container %s has active exec sessions, refusing to clean up", c.ID())
}
return c.cleanupStorage() return c.cleanupStorage()
} }