diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-17 10:11:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 10:11:07 -0500 |
| commit | 0418f5ee6598c3a5805f0c2950f5058239b9658e (patch) | |
| tree | 14c68e4db6b71d99bc1026544df662042c308160 /pkgs/applications/networking | |
| parent | 968c964853ef199b16d96f4d7c6c5d5f6a24e6f6 (diff) | |
| parent | fd09c3dcae0365871b9bc995a5241431a210e506 (diff) | |
| download | nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.tar nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.tar.gz nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.tar.bz2 nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.tar.lz nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.tar.xz nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.tar.zst nixlib-0418f5ee6598c3a5805f0c2950f5058239b9658e.zip | |
Merge pull request #38321 from jensbin/openshift_mount_fix
openshift: Fix binary paths for oc cluster up to work
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/openshift/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 3f7e0650e0d5..07c9e9ba6784 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -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 , components ? [ "cmd/oc" @@ -37,6 +37,18 @@ in stdenv.mkDerivation rec { patchPhase = '' 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 = '' |