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

Merge pull request #6868 from mheon/fix_mount_rootless

Browse Source 
Fix bug where `podman mount` didn't error as rootless
This commit is contained in:
OpenShift Merge Robot
2020-07-06 16:41:59 -04:00
committed by GitHub
parent f4708a5c49 f4c649bdec
commit fca3434ee7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/podman/containers/mount.go
View File

@ -30,13 +30,18 @@ var (
Args: func(cmd *cobra.Command, args []string) error { Args: func(cmd *cobra.Command, args []string) error {
return validate.CheckAllLatestAndCIDFile(cmd, args, true, false) return validate.CheckAllLatestAndCIDFile(cmd, args, true, false)
}, },
Annotations: map[string]string{
registry.ParentNSRequired: "",
},
} }
containerMountCommmand = &cobra.Command{ containerMountCommmand = &cobra.Command{
Use: mountCommand.Use, Use: mountCommand.Use,
Short: mountCommand.Short, Short: mountCommand.Short,
Long: mountCommand.Long, Long: mountCommand.Long,
RunE: mountCommand.RunE, RunE: mountCommand.RunE,
Args: mountCommand.Args,
Annotations: mountCommand.Annotations,
} }
) )

1
test/e2e/mount_test.go
View File

@ -18,6 +18,7 @@ var _ = Describe("Podman mount", func() {
) )
BeforeEach(func() { BeforeEach(func() {
SkipIfRootless()
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)