opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-11 16:26:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update kpod mount and umount to use the new state

Browse Source 
The new state for containers has been added
moved kpod mount and umount over to use it

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>

Closes: #57
Approved by: rhatdan
This commit is contained in:
umohnani8
2017-11-22 10:46:47 -05:00
committed by Atomic Bot
parent 34ba0cb8a9
commit 40dce698d3
4 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cmd/kpod/mount.go
View File

@ -42,7 +42,7 @@ var (
}
)
// MountOutputParams stores info about each layer
// jsonMountPoint stores info about each container
type jsonMountPoint struct {
ID string `json:"id"`
Names []string `json:"names"`
@ -50,6 +50,16 @@ type jsonMountPoint struct {
}
func mountCmd(c *cli.Context) error {
if err := validateFlags(c, mountFlags); err != nil {
return err
}
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
defer runtime.Shutdown(false)
formats := map[string]bool{
"": true,
of.JSONString: true,
@ -64,49 +74,43 @@ func mountCmd(c *cli.Context) error {
if len(args) > 1 {
return errors.Errorf("too many arguments specified")
}
if err := validateFlags(c, mountFlags); err != nil {
return err
}
config, err := getConfig(c)
if err != nil {
return errors.Wrapf(err, "Could not get config")
}
store, err := getStore(config)
if err != nil {
return errors.Wrapf(err, "error getting store")
}
if len(args) == 1 {
if json {
return errors.Wrapf(err, "json option can not be used with a container id")
}
mountPoint, err := store.Mount(args[0], c.String("label"))
ctr, err := runtime.LookupContainer(args[0])
if err != nil {
return errors.Wrapf(err, "error finding container %q", args[0])
return errors.Wrapf(err, "error looking up container %q", args[0])
}
mountPoint, err := ctr.Mount(c.String("label"))
if err != nil {
return errors.Wrapf(err, "error mounting container %q", ctr.ID())
}
fmt.Printf("%s\n", mountPoint)
} else {
jsonMountPoints := []jsonMountPoint{}
containers, err2 := store.Containers()
containers, err2 := runtime.GetContainers()
if err2 != nil {
return errors.Wrapf(err2, "error reading list of all containers")
}
for _, container := range containers {
layer, err := store.Layer(container.LayerID)
mountPoint, err := container.MountPoint()
if err != nil {
return errors.Wrapf(err, "error finding layer %q for container %q", container.LayerID, container.ID)
return errors.Wrapf(err, "error getting mountpoint for %q", container.ID())
}
if layer.MountPoint == "" {
if mountPoint == "" {
continue
}
if json {
jsonMountPoints = append(jsonMountPoints, jsonMountPoint{ID: container.ID, Names: container.Names, MountPoint: layer.MountPoint})
jsonMountPoints = append(jsonMountPoints, jsonMountPoint{ID: container.ID(), Names: []string{container.Name()}, MountPoint: mountPoint})
continue
}
if c.Bool("notruncate") {
fmt.Printf("%-64s %s\n", container.ID, layer.MountPoint)
fmt.Printf("%-64s %s\n", container.ID(), mountPoint)
} else {
fmt.Printf("%-12.12s %s\n", container.ID, layer.MountPoint)
fmt.Printf("%-12.12s %s\n", container.ID(), mountPoint)
}
}
if json {

21
cmd/kpod/umount.go
View File

@ -17,6 +17,12 @@ var (
)
func umountCmd(c *cli.Context) error {
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
defer runtime.Shutdown(false)
args := c.Args()
if len(args) == 0 {
return errors.Errorf("container ID must be specified")
@ -24,18 +30,11 @@ func umountCmd(c *cli.Context) error {
if len(args) > 1 {
return errors.Errorf("too many arguments specified")
}
config, err := getConfig(c)
ctr, err := runtime.LookupContainer(args[0])
if err != nil {
return errors.Wrapf(err, "Could not get config")
}
store, err := getStore(config)
if err != nil {
return err
return errors.Wrapf(err, "error looking up container %q", args[0])
}
err = store.Unmount(args[0])
if err != nil {
return errors.Wrapf(err, "error unmounting container %q", args[0])
}
return nil
return ctr.Unmount()
}