public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38321 from jensbin/openshift_mount_fix

Browse Source 
openshift: Fix binary paths for oc cluster up to work
This commit is contained in:
Matthew Justin Bauer 2018-04-17 10:11:07 -05:00 committed by GitHub
commit 0418f5ee65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync { stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux
, iptables, coreutils, kerberos, clang , iptables, coreutils, kerberos, clang
, components ? [ , components ? [
"cmd/oc" "cmd/oc"
@ -37,6 +37,18 @@ in stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
patchShebangs ./hack patchShebangs ./hack
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
''; '';
buildPhase = '' buildPhase = ''