From e33dfa936f9c16545fe85f1b837ed402651b75df Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 6 Aug 2012 20:05:35 +0200
Subject: [PATCH] Use busybox mount instead of klibc nfsmount for nfs mounts in
 initrd.

---
 modules/system/boot/stage-1-init.sh | 6 +-----
 modules/tasks/filesystems/nfs.nix   | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 112d3798aec..824c19f0df5 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -266,11 +266,7 @@ mountFS() {
     # For CIFS mounts, retry a few times before giving up.
     local n=0
     while true; do
-        if [ "$fsType" = "nfs" ]; then
-          nfsmount "$device" "/mnt-root$mountPoint" && break
-        else
-          mount "/mnt-root$mountPoint" && break
-        fi
+        mount "/mnt-root$mountPoint" && break
         if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
         echo "retrying..."
         n=$((n + 1))
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 0ed76a9db77..491d2de8f24 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -40,12 +40,6 @@ in
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
-    boot.initrd.extraUtilsCommands = mkIf inInitrd
-      ''
-        # !!! Uh, why don't we just install mount.nfs?
-        cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
-      '';
-
     # Ensure that statd and idmapd are started before mountall.
     jobs.mountall.preStart =
       ''