b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use busybox mount instead of klibc nfsmount for nfs mounts in initrd.

Browse source
This commit is contained in:
Rickard Nilsson 2012-08-06 20:05:35 +02:00 committed by Eelco Dolstra
parent d13a3c741a
commit e33dfa936f
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/system/boot/stage-1-init.sh
View file

@ -266,11 +266,7 @@ mountFS() {
# For CIFS mounts, retry a few times before giving up. # For CIFS mounts, retry a few times before giving up.
local n=0 local n=0
while true; do while true; do
if [ "$fsType" = "nfs" ]; then mount "/mnt-root$mountPoint" && break
nfsmount "$device" "/mnt-root$mountPoint" && break
else
mount "/mnt-root$mountPoint" && break
fi
if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
echo "retrying..." echo "retrying..."
n=$((n + 1)) n=$((n + 1))

6
modules/tasks/filesystems/nfs.nix
View file

@ -40,12 +40,6 @@ in
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; 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. # Ensure that statd and idmapd are started before mountall.
jobs.mountall.preStart = jobs.mountall.preStart =
'' ''