Message ID | 605ec1ab24117c2db1625bf1dafc7736e6080a51.1686062510.git.h.goebel@crazy-compilers.com |
---|---|
State | New |
Headers | show |
Series | [bug#63928] gnu: podman: Fix path to helper binaries. | expand |
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis: > 'quadlet' and 'rootlessport' coming with podman reside in > "#$output/libexex/podman", not in "#$output/bin". Thus search this > first. > > * gnu/packages/containers.scm (podman)[phases]<fix-hardcoded-paths>: > Change subsitution for "/usr/local/libexec/podman", add substitution > for "/usr/local/lib/podman". LGTM!
Am 01.07.23 um 18:08 schrieb Ludovic Courtès:
> LGTM!
Thanks for the review. Pushed as 1d471bbe440ba254c6e1c557d0fad91d67e1450c
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index b402bbde6a..0cf89db23f 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -359,6 +359,8 @@ configure network interfaces in Linux containers.") (string-append "CATATONIT_PATH=" (which "true")))) (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go" (("/usr/local/libexec/podman") + (string-append #$output "/libexec/podman")) + (("/usr/local/lib/podman") (string-append #$output "/bin"))) (substitute* "vendor/github.com/containers/common/pkg/config/default.go" (("/usr/libexec/podman/conmon") (which "conmon"))