[oe-commits] org.oe.dev initramfs-module-nfs: Make it actually mount NFS by using the same option as kernel does.

[pfalcon commit]

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

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 40ab4dbab9975c9eb3d37f459b6972306a5b1a37
ViewMTN: http://monotone.openembedded.org/revision.psp?id=40ab4dbab9975c9eb3d37f459b6972306a5b1a37
Files:
1
packages/initrdscripts/files/nfsboot.sh
packages/initrdscripts/initramfs-module-nfs_0.1.bb
Diffs:

#
# mt diff -rcded186bb21fd2a46075d4d3caad480217ff9eb2 -r40ab4dbab9975c9eb3d37f459b6972306a5b1a37
#
# 
# 
# patch "packages/initrdscripts/files/nfsboot.sh"
#  from [4c785995ab2b26c32e3e1eefa8b53d032a25f3d2]
#    to [cc74b5caa9ab77aa37036dc350e5b6aea94c0f7a]
# 
# patch "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
#  from [92d2e8058a5239183232bd1bcf688e6a0758f0f4]
#    to [62635c830fd535d4ff4b1c60539a08d5cd14ffe9]
# 
============================================================
--- packages/initrdscripts/files/nfsboot.sh	4c785995ab2b26c32e3e1eefa8b53d032a25f3d2
+++ packages/initrdscripts/files/nfsboot.sh	cc74b5caa9ab77aa37036dc350e5b6aea94c0f7a
@@ -1,6 +1,11 @@ if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then
 #!/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
============================================================
--- packages/initrdscripts/initramfs-module-nfs_0.1.bb	92d2e8058a5239183232bd1bcf688e6a0758f0f4
+++ packages/initrdscripts/initramfs-module-nfs_0.1.bb	62635c830fd535d4ff4b1c60539a08d5cd14ffe9
@@ -1,5 +1,5 @@ SRC_URI = "file://nfsboot.sh"
 SRC_URI = "file://nfsboot.sh"
-PR = "r0"
+PR = "r1"
 
 do_install() {
         install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs