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

cmd: do not require userns for "version"

Browse Source 
Closes: https://github.com/containers/podman/issues/17657

[NO NEW TESTS NEEDED]

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2023-03-02 22:18:25 +01:00
parent 2860d55c97
commit 0498ce3a56
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/system/version.go
View File

@ -22,6 +22,9 @@ var (
Short: "Display the Podman version information", Short: "Display the Podman version information",
RunE: version, RunE: version,
ValidArgsFunction: completion.AutocompleteNone, ValidArgsFunction: completion.AutocompleteNone,
Annotations: map[string]string{
registry.ParentNSRequired: "",
},
} }
versionFormat string versionFormat string
) )

1
pkg/rootless/rootless_linux.c
View File

@ -386,6 +386,7 @@ can_use_shortcut (char **argv)
if (strcmp (argv[argc], "mount") == 0 if (strcmp (argv[argc], "mount") == 0
|| strcmp (argv[argc], "machine") == 0 || strcmp (argv[argc], "machine") == 0
|| strcmp (argv[argc], "version") == 0
|| strcmp (argv[argc], "context") == 0 || strcmp (argv[argc], "context") == 0
|| strcmp (argv[argc], "search") == 0 || strcmp (argv[argc], "search") == 0
|| (strcmp (argv[argc], "system") == 0 && argv[argc+1] && strcmp (argv[argc+1], "service") != 0)) || (strcmp (argv[argc], "system") == 0 && argv[argc+1] && strcmp (argv[argc+1], "service") != 0))