nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

34 lines
1.1 KiB
Diff
Raw Normal View History

2023-10-03 12:42:40 +00:00
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
2024-04-04 13:43:54 +00:00
index 1afc3d15b..a8aafcaae 100644
2023-10-03 12:42:40 +00:00
--- a/pkg/machine/machine_common.go
+++ b/pkg/machine/machine_common.go
2024-04-04 13:43:54 +00:00
@@ -33,13 +33,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
// WaitAPIAndPrintInfo prints info about the machine and does a ping test on the
// API socket
func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) {
- suffix := ""
var fmtString string
- if name != DefaultMachineName {
- suffix = " " + name
- }
-
if forwardState == NoForwarding {
return
}
@@ -61,14 +56,6 @@ address can't be used by podman. `
2023-10-03 12:42:40 +00:00
if len(helper) < 1 {
fmt.Print(fmtString)
- } else {
- fmtString += `If you would like to install it, run the following commands:
2023-10-03 12:42:40 +00:00
-
- sudo %s install
- podman machine stop%[2]s; podman machine start%[2]s
2023-10-03 12:42:40 +00:00
-
2024-04-04 13:43:54 +00:00
-`
2023-10-03 12:42:40 +00:00
- fmt.Printf(fmtString, helper, suffix)
}
case MachineLocal:
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")