summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-06 16:41:59 -0400
committerGitHub <noreply@github.com>2020-07-06 16:41:59 -0400
commitfca3434ee7e7af4315717825aa67d4a23447cb6f (patch)
treed29667820c593b880c2a7b128367a74b500414dd /cmd
parentf4708a5c49e49694307a63ce70d0b9c5fe5c310f (diff)
parentf4c649bdec3c6eed7541f2c4c60d69e89ef228f7 (diff)
downloadpodman-fca3434ee7e7af4315717825aa67d4a23447cb6f.tar.gz
podman-fca3434ee7e7af4315717825aa67d4a23447cb6f.tar.bz2
podman-fca3434ee7e7af4315717825aa67d4a23447cb6f.zip
Merge pull request #6868 from mheon/fix_mount_rootless
Fix bug where `podman mount` didn't error as rootless
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/containers/mount.go13
1 files changed, 9 insertions, 4 deletions
diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go
index 2de1066a3..186c4df16 100644
--- a/cmd/podman/containers/mount.go
+++ b/cmd/podman/containers/mount.go
@@ -30,13 +30,18 @@ var (
Args: func(cmd *cobra.Command, args []string) error {
return validate.CheckAllLatestAndCIDFile(cmd, args, true, false)
},
+ Annotations: map[string]string{
+ registry.ParentNSRequired: "",
+ },
}
containerMountCommmand = &cobra.Command{
- Use: mountCommand.Use,
- Short: mountCommand.Short,
- Long: mountCommand.Long,
- RunE: mountCommand.RunE,
+ Use: mountCommand.Use,
+ Short: mountCommand.Short,
+ Long: mountCommand.Long,
+ RunE: mountCommand.RunE,
+ Args: mountCommand.Args,
+ Annotations: mountCommand.Annotations,
}
)