diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-09 09:25:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-09 09:25:57 -0500 |
commit | 41e2c9943e2e8c5f2f5c2003cc745cb6b1ecb3a7 (patch) | |
tree | af5117b73bcc14c9c87fada3998877804a87ae95 | |
parent | 3e870f8c8e3736e9c81473d45c8148d4de0e70c3 (diff) | |
parent | a7c4691bfffe8556e02a3c1612849a71899ee885 (diff) | |
download | podman-41e2c9943e2e8c5f2f5c2003cc745cb6b1ecb3a7.tar.gz podman-41e2c9943e2e8c5f2f5c2003cc745cb6b1ecb3a7.tar.bz2 podman-41e2c9943e2e8c5f2f5c2003cc745cb6b1ecb3a7.zip |
Merge pull request #13465 from n1hility/improve-install-msg
Improve agent install message to add restart instructions
-rw-r--r-- | pkg/machine/qemu/machine.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 92d8d1854..3b4548c17 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -1104,16 +1104,15 @@ func waitAndPingAPI(sock string) { func waitAPIAndPrintInfo(forwardState apiForwardingState, forwardSock string, rootFul bool, name string) { if forwardState != noForwarding { + suffix := "" + if name != machine.DefaultMachineName { + suffix = " " + name + } waitAndPingAPI(forwardSock) if !rootFul { fmt.Printf("\nThis machine is currently configured in rootless mode. If your containers\n") fmt.Printf("require root permissions (e.g. ports < 1024), or if you run into compatibility\n") fmt.Printf("issues with non-podman clients, you can switch using the following command: \n") - - suffix := "" - if name != machine.DefaultMachineName { - suffix = " " + name - } fmt.Printf("\n\tpodman machine set --rootful%s\n\n", suffix) } @@ -1127,8 +1126,9 @@ func waitAPIAndPrintInfo(forwardState apiForwardingState, forwardSock string, ro fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") fmt.Printf("address can't be used by podman. ") if helper := findClaimHelper(); len(helper) > 0 { - fmt.Printf("If you would like to install it run the\nfollowing command:\n") - fmt.Printf("\n\tsudo %s install\n\n", helper) + fmt.Printf("If you would like to install it run the\nfollowing commands:\n") + fmt.Printf("\n\tsudo %s install\n", helper) + fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) } case machineLocal: fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") |