Using NFS in conjunction with boot spec and the feature to let barebox
auto generate a kernel command line must keep the options the NFS filesystem
was mounted in barebox. This patch extends the kernel command line parameter
on demand if something different than the defaults are used.
The command:
barebox:/ boot nfs://myhost//root
expands to the kernel command line:
nfsroot=myhost:/root,v3,tcp
while the command:
barebox:/ boot nfs://myhost:2049//root
expands now to the kernel command line:
nfsroot=myhost:/root,v3,tcp,mountport=2049,port=2049
Signed-off-by: Juergen Borleis <jbe@xxxxxxxxxxxxxx>
diff --git a/Documentation/user/booting-linux.rst b/Documentation/user/booting-linux.rst
index 39084e5afe08..5b021f0662de 100644
--- a/Documentation/user/booting-linux.rst
+++ b/Documentation/user/booting-linux.rst
@@ -203,7 +203,7 @@ compatible NFS URI string must be passed to the boot command:
.. code-block:: sh
- boot nfs://nfshost//path/
+ boot nfs://nfshost[:port]//path/
Additionally to the options defined in the original spec barebox understands the
``linux-appendroot`` option. This is a boolean value and if set to ``true`` barebox
diff --git a/fs/nfs.c b/fs/nfs.c
index 382475249fc8..effedcc6649c 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -1311,7 +1311,7 @@ static char *rootnfsopts;
static void nfs_set_rootarg(struct nfs_priv *npriv, struct fs_device_d *fsdev)
{
- char *str;
+ char *str, *tmp;
const char *ip;
ip = ip_to_string(npriv->server);
@@ -1319,6 +1319,19 @@ static void nfs_set_rootarg(struct nfs_priv *npriv, struct fs_device_d *fsdev)
ip, npriv->path, rootnfsopts[0] ? "," : "",
rootnfsopts);
+ /* forward specific mount options on demand */
+ if (npriv->nfs_port != PROG_NFS) {
+ tmp = asprintf("%s,port=%hu", str, npriv->nfs_port);
+ free(str);
+ str = tmp;
+ }
+
+ if (npriv->mount_port != PROG_MOUNT) {
+ tmp = asprintf("%s,mountport=%hu", str, npriv->mount_port);
+ free(str);
+ str = tmp;
+ }
+
fsdev_set_linux_rootarg(fsdev, str);
free(str);
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
