From bcd9b8125c4f042e596b2b9263f60825f32e15aa Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 18 Aug 2020 06:47:19 -0400
Subject: Add support for --connection

* override --url and/or --identity fields from containers.conf
* --connection flag has higher precedence than ActiveService from
containers.conf. Which is set via podman system connection default
* Add newline to error message printed on stderr
* Added --connection to bash completion and documentation
* Updated bindings to query server in case of no path or /

Closes #jira-991
Fixes #7276

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Jhon Honce <jhonce@redhat.com>

Squashed commits to work around CI issue

<MH: Fixed rebase conflicts on v2.0>

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 completions/bash/podman | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'completions')

diff --git a/completions/bash/podman b/completions/bash/podman
index abcf54416..bd72649bb 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -3546,22 +3546,32 @@ _podman_volume() {
 
 _podman_podman() {
      local options_with_args="
-	   --config -c
+	   --cni-config-dir
+	   --conmon
+	   --connection -c
+	   --events-backend
+	   --hooks-dir
+	   --identity
+	   --log-level
+	   --namespace
+	   --network-cmd-path
 	   --root
 	   --runroot
 	   --storage-driver
 	   --storage-opt
-	   --log-level
-	   --namespace
-    "
+	   --tmpdir
+	   --runtime
+	   --url
+     "
      local boolean_options="
 	   --help
-	   -h
+	   --syslog
 	   --version
+	   -h
+	   -r, --remote
 	   -v
-	   --syslog
      "
-     commands="
+    commands="
     attach
     auto-update
     build
-- 
cgit v1.2.3-54-g00ecf