initramfs-module-nfs: Make it actually mount NFS by using the same option as kernel...

diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/nfsboot.sh
index 62a0442..5129a53 100644 (file)
--- a/packages/initrdscripts/files/nfsboot.sh
+++ b/packages/initrdscripts/files/nfsboot.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 
 if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then
+
+    # These correspond to what kernel itself uses
+    # DO NOT CHANGE!
+    NFS_OPTIONS="-o nfsvers=2,nolock"
+
     for arg in $CMDLINE; do
         echo $arg
         optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
@@ -33,6 +38,6 @@ if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then
     )
 
     echo "booting from NFS: $nfsroot"
-    mount -t nfs $nfsroot /mnt
+    mount -t nfs $NFS_OPTIONS $nfsroot /mnt
     BOOT_ROOT=/mnt
 fi

diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_0.1.bb
index 90b80a3..9f4436a 100644 (file)
--- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb
+++ b/packages/initrdscripts/initramfs-module-nfs_0.1.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://nfsboot.sh"
-PR = "r0"
+PR = "r1"
 
 do_install() {
         install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs