summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-07-06 12:56:52 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-07-06 12:56:52 -0400
commit195d44bde6394633db3d750d06356751a9daab01 (patch)
treef385a7eadb188e2471e6c945a6e1d63396b6b484
parent9eac75a967e3459b32b1acd220afb49b60f5e5aa (diff)
downloadpodman-195d44bde6394633db3d750d06356751a9daab01.tar.gz
podman-195d44bde6394633db3d750d06356751a9daab01.tar.bz2
podman-195d44bde6394633db3d750d06356751a9daab01.zip
Fix bug where `podman mount` didn't error as rootless
We require that rootless `podman mount` be run inside a shell spawned by `podman unshare` (which gives us a mount namespace which actually lets other commands use the mounted filesystem). The fix is simple - we need to mark the command as requiring the rootless user namespace not be configured, so we can test for it later as part of the mount code and error if we needed to make one. Fixes #6856 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-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,
}
)