mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [RFC] nfs: forward filesystem options to the kernel command line
@ 2016-02-02 11:06 Juergen Borleis
  2016-02-02 13:49 ` [PATCH v2] " Juergen Borleis
  0 siblings, 1 reply; 3+ messages in thread
From: Juergen Borleis @ 2016-02-02 11:06 UTC (permalink / raw)
  To: barebox

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 were 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
    
now expands to the kernel command line:
   
nfsroot=myhost:/root,v3,tcp,mountport=2049,port=2049
    
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>

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..14d7cb138e40 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -1324,11 +1324,21 @@ static void nfs_set_rootarg(struct nfs_priv *npriv, struct fs_device_d *fsdev)
 	free(str);
 }
 
+static void nfs_extend_options(char **opts, const char *ext)
+{
+	size_t u;
+
+	u = strlen(*opts);
+	*opts = xrealloc(*opts, u + 1 + strlen(ext));
+	strcat(*opts + u, ext);
+}
+
 static int nfs_probe(struct device_d *dev)
 {
 	struct fs_device_d *fsdev = dev_to_fs_device(dev);
 	struct nfs_priv *npriv = xzalloc(sizeof(struct nfs_priv));
 	char *tmp = xstrdup(fsdev->backingstore);
+	char buf[20];
 	char *path;
 	int ret;
 
@@ -1367,6 +1377,9 @@ static int nfs_probe(struct device_d *dev)
 			goto err2;
 		}
 		npriv->mount_port = ret;
+	} else {
+		snprintf(buf, sizeof(buf), ",mountport=%d", npriv->mount_port);
+		nfs_extend_options(&rootnfsopts, buf);
 	}
 	debug("mount port: %hu\n", npriv->mount_port);
 
@@ -1378,6 +1391,9 @@ static int nfs_probe(struct device_d *dev)
 			goto err2;
 		}
 		npriv->nfs_port = ret;
+	} else {
+		snprintf(buf, sizeof(buf), ",port=%d", npriv->nfs_port);
+		nfs_extend_options(&rootnfsopts, buf);
 	}
 	debug("nfs port: %d\n", npriv->nfs_port);
 

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH v2] nfs: forward filesystem options to the kernel command line
  2016-02-02 11:06 [RFC] nfs: forward filesystem options to the kernel command line Juergen Borleis
@ 2016-02-02 13:49 ` Juergen Borleis
  2016-02-04  8:06   ` Sascha Hauer
  0 siblings, 1 reply; 3+ messages in thread
From: Juergen Borleis @ 2016-02-02 13:49 UTC (permalink / raw)
  To: barebox

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@pengutronix.de>

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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH v2] nfs: forward filesystem options to the kernel command line
  2016-02-02 13:49 ` [PATCH v2] " Juergen Borleis
@ 2016-02-04  8:06   ` Sascha Hauer
  0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2016-02-04  8:06 UTC (permalink / raw)
  To: Juergen Borleis; +Cc: barebox

On Tue, Feb 02, 2016 at 02:49:09PM +0100, Juergen Borleis wrote:
> 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@pengutronix.de>
> 
> 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

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-04  8:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-02 11:06 [RFC] nfs: forward filesystem options to the kernel command line Juergen Borleis
2016-02-02 13:49 ` [PATCH v2] " Juergen Borleis
2016-02-04  8:06   ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox