b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

podman: Remove unconfigured runtime warnings

Browse source 
It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
This commit is contained in:
adisbladis 2021-02-13 14:38:00 +01:00
parent 28adb5b0c1
commit 304617494b
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/virtualization/podman/default.nix
View file

@ -25,6 +25,10 @@ buildGoModule rec {
sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1";
};
patches = [
./remove-unconfigured-runtime-warn.patch
];
vendorSha256 = null;
doCheck = false;

23
pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch Normal file
View file

@ -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