diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-08 08:37:14 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-08 09:27:39 -0400 |
| commit | 5cbb0b8a665eb28b5b47212d35a6204d2be202fb (patch) | |
| tree | 1e9fafe7376d8811f01d4ca6838005614249429d /cmd | |
| parent | ff1c59065e9d2ef0c03ce8de444b489630d00b3c (diff) | |
| download | podman-5cbb0b8a665eb28b5b47212d35a6204d2be202fb.tar.gz podman-5cbb0b8a665eb28b5b47212d35a6204d2be202fb.tar.bz2 podman-5cbb0b8a665eb28b5b47212d35a6204d2be202fb.zip | |
Fix handling of overridden paths from database
If the first time you run podman in a user account you do a
su - USER, and the second time, you run as the logged in USER
podman fails, because it is not handling the tmpdir definition
in the database. This PR fixes this problem.
vendor containers/common v0.11.1
This should fix a couple of issues we have seen in podman 1.9.1
with handling of libpod.conf.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/login.go | 1 | ||||
| -rw-r--r-- | cmd/podman/logout.go | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 8413861f5..92f13d0e7 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -46,7 +46,6 @@ func init() { // Podman flags. flags.BoolVarP(&loginOptions.tlsVerify, "tls-verify", "", false, "Require HTTPS and verify certificates when contacting registries") - flags.BoolVarP(&loginOptions.GetLoginSet, "get-login", "", false, "Return the current login user for the registry") loginOptions.Stdin = os.Stdin loginOptions.Stdout = os.Stdout loginOptions.AcceptUnspecifiedRegistry = true diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index d0afc21b4..c016de8ae 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -37,7 +37,6 @@ func init() { // Flags from the auth package. flags.AddFlagSet(auth.GetLogoutFlags(&logoutOptions)) - logoutOptions.Stdin = os.Stdin logoutOptions.Stdout = os.Stdout logoutOptions.AcceptUnspecifiedRegistry = true } |