summaryrefslogtreecommitdiffstats
path: root/common/boot.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-08-29 17:31:14 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-08-29 17:37:12 +0200
commit79a2cc9fe6b1db9255c3947f2067adc8eb3ce048 (patch)
tree2124f44f031fe86ad330e37fbdf5e184e79fb897 /common/boot.c
parent438956c6e09429451705e2bc8180c0dc29a42474 (diff)
downloadbarebox-79a2cc9fe6b1db9255c3947f2067adc8eb3ce048.tar.gz
blspec: Handle nfs:// pathes from boot
Fixes: cb47dde boot: Call blspec_scan_directory() only on strings containing an absolute path This commit introduced a check if the path contains a '/' at the beginning. For booting a bootloader spec entry from NFS we have to test the path for starting with "nfs://" aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/boot.c')
-rw-r--r--common/boot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/boot.c b/common/boot.c
index e66bacb..df9cba5 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -250,6 +250,7 @@ static int bootscript_scan_path(struct bootentries *bootentries, const char *pat
* - a cdev name
* - a full path of a directory containing bootloader spec entries
* - a full path of a directory containing bootscripts
+ * - a nfs:// path
*
* Returns the number of entries found or a negative error code.
*/
@@ -263,7 +264,7 @@ int bootentry_create_from_name(struct bootentries *bootentries,
if (ret > 0)
found += ret;
- if (*name == '/') {
+ if (*name == '/' || !strncmp(name, "nfs://", 6)) {
ret = blspec_scan_directory(bootentries, name);
if (ret > 0)
found += ret;