This adds the linux.bootarg device parameter from the network device of
the current nfs connection and adds it to the nfs bootargs line.

This allows booting from nfs without manually setting a ip=dhcp or
ip=<ipaddr> option.

Signed-off-by: Enrico Jorns <e...@pengutronix.de>
---
 fs/nfs.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fs/nfs.c b/fs/nfs.c
index a0a9dfc..97f01cf 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -1314,6 +1314,7 @@ static char *rootnfsopts;
 static void nfs_set_rootarg(struct nfs_priv *npriv, struct fs_device_d *fsdev)
 {
        char *str, *tmp;
+       const char *bootargs;
 
        str = basprintf("root=/dev/nfs nfsroot=%pI4:%s%s%s", &npriv->server, 
npriv->path,
                          rootnfsopts[0] ? "," : "", rootnfsopts);
@@ -1331,6 +1332,13 @@ static void nfs_set_rootarg(struct nfs_priv *npriv, 
struct fs_device_d *fsdev)
                str = tmp;
        }
 
+       bootargs = dev_get_param(&npriv->con->edev->dev, "linux.bootargs");
+       if (bootargs) {
+               tmp = basprintf("%s %s", str, bootargs);
+               free(str);
+               str = tmp;
+       }
+
        fsdev_set_linux_rootarg(fsdev, str);
 
        free(str);
-- 
2.8.1


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

Reply via email to