about summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster/openshift
diff options
context:
space:
mode:
authorJens Binkert <jensbin@protonmail.com>2018-04-02 11:25:54 +0200
committerJens Binkert <jensbin@protonmail.com>2018-04-02 11:25:54 +0200
commitfd09c3dcae0365871b9bc995a5241431a210e506 (patch)
treea9282a6832f32608fe80dbce753ea8b97d9262ba /pkgs/applications/networking/cluster/openshift
parent6654fde54888bc58e1f9321cb9a0215342cda512 (diff)
Fix openshift oc cluster up mount
Diffstat (limited to 'pkgs/applications/networking/cluster/openshift')
-rw-r--r--pkgs/applications/networking/cluster/openshift/default.nix14
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 3f7e0650e0d56..07c9e9ba6784a 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 = ''