dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

podman: fix patches

Browse Source
This commit is contained in:
Petr Zahradnik 2024-11-17 16:42:53 +01:00
parent c877626bf3
commit b9f3beec55
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/po/podman/hardcode-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
index 3a6d804ad..5628e2bf6 100644 index 02ff128..d3254ba 100644
--- a/vendor/github.com/containers/common/pkg/config/default.go --- a/vendor/github.com/containers/common/pkg/config/default.go
+++ b/vendor/github.com/containers/common/pkg/config/default.go +++ b/vendor/github.com/containers/common/pkg/config/default.go
@@ -366,75 +366,34 @@ func defaultEngineConfig() (*EngineConfig, error) { @@ -378,75 +378,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
c.Retry = 3 c.Retry = 3
c.OCIRuntimes = map[string][]string{ c.OCIRuntimes = map[string][]string{
"crun": { "crun": {
@ -88,7 +88,7 @@ index 3a6d804ad..5628e2bf6 100644
}, },
} }
c.PlatformToOCIRuntime = map[string]string{ c.PlatformToOCIRuntime = map[string]string{
@@ -445,26 +404,12 @@ func defaultEngineConfig() (*EngineConfig, error) { @@ -457,26 +416,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
// Needs to be called after populating c.OCIRuntimes. // Needs to be called after populating c.OCIRuntimes.
c.OCIRuntime = c.findRuntime() c.OCIRuntime = c.findRuntime()

8
pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
View File

@ -1,22 +1,22 @@
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
index 1afc3d15b..a8aafcaae 100644 index d2ba418..5098cdc 100644
--- a/pkg/machine/machine_common.go --- a/pkg/machine/machine_common.go
+++ b/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go
@@ -33,13 +33,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) { @@ -34,13 +34,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
// WaitAPIAndPrintInfo prints info about the machine and does a ping test on the // WaitAPIAndPrintInfo prints info about the machine and does a ping test on the
// API socket // API socket
func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) { func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) {
- suffix := "" - suffix := ""
var fmtString string var fmtString string
- if name != DefaultMachineName { - if name != define.DefaultMachineName {
- suffix = " " + name - suffix = " " + name
- } - }
- -
if forwardState == NoForwarding { if forwardState == NoForwarding {
return return
} }
@@ -61,14 +56,6 @@ address can't be used by podman. ` @@ -62,14 +57,6 @@ address can't be used by podman. `
if len(helper) < 1 { if len(helper) < 1 {
fmt.Print(fmtString) fmt.Print(fmtString)