diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-02-13 14:38:00 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2021-02-13 14:39:02 +0100 |
| commit | 304617494bc2066bae25e7ca221e638f81b28e5a (patch) | |
| tree | ba9360ea30a45b6c5e68a3494952e1d5561a4bb2 /pkgs/applications/virtualization/podman | |
| parent | 28adb5b0c132d0aaa203a91e4a92d47b6cb429b2 (diff) | |
podman: Remove unconfigured runtime warnings
It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
Diffstat (limited to 'pkgs/applications/virtualization/podman')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch | 23 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index e82ab35a3449c..7eaff92675159 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -25,6 +25,10 @@ buildGoModule rec { sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1"; }; + patches = [ + ./remove-unconfigured-runtime-warn.patch + ]; + vendorSha256 = null; doCheck = false; diff --git a/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch b/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch new file mode 100644 index 0000000000000..8530cd93cdf3a --- /dev/null +++ b/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch @@ -0,0 +1,23 @@ +Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf + +It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths. +--- + vendor/github.com/containers/common/pkg/config/config.go | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go +index 4a98c7e92..4a95a2a49 100644 +--- a/vendor/github.com/containers/common/pkg/config/config.go ++++ b/vendor/github.com/containers/common/pkg/config/config.go +@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string { + return name + } + } +- if path, err := exec.LookPath(name); err == nil { +- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path) ++ if _, err := exec.LookPath(name); err == nil { + return name + } + } +-- +2.30.0 |