podman: add mac-helper patch

This commit is contained in:
zowoq 2022-12-12 11:44:50 +10:00
parent fb83ee7d26
commit 596fbebaab
2 changed files with 21 additions and 0 deletions

View File

@ -27,6 +27,11 @@ buildGoModule rec {
sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY=";
};
patches = [
# we intentionally don't build and install the helper so we shouldn't display messages to users about it
./rm-podman-mac-helper-msg.patch
];
vendorSha256 = null;
doCheck = false;

View File

@ -0,0 +1,16 @@
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index a6907c0df..717d82ff3 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward
case notInstalled:
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 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")
case claimUnsupported: