From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master] of: overlay: don't do fixups on empty global.of.overlay.dir
Date: Tue, 31 Aug 2021 18:11:39 +0200 [thread overview]
Message-ID: <20210831161139.2988-1-a.fatoum@pengutronix.de> (raw)
$global.of.overlay.dir is dynamically prepended with the root of the
device currently being booted. This allows use of relative paths.
Because $global.of.overlay.filepattern is * by default, this means that
all files in the root of the device will be considered overlays and
barebox will try to unflatten them leading to an error message on boot:
ERROR: of_overlay: Failed to unflatten /mnt/mmc0.4//.root_is_rw:
Invalid argument
Fix this by not doing any fixups at all on empty global.of.overlay.dir.
If for whatever reason, a user wants overlays at /, they can
global.of.overlay.dir=.
Fixes: 124c64af0982 ("overlay: Add filters to choose which overlays to apply")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/of/overlay.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 42b309805fd2..25140eed31ed 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -460,6 +460,9 @@ static int of_overlay_global_fixup(struct device_node *root, void *data)
if (*of_overlay_dir == '/')
return of_overlay_apply_dir(root, of_overlay_dir, true);
+ if (*of_overlay_dir == '\0')
+ return 0;
+
dir = concat_path_file(of_overlay_basedir, of_overlay_dir);
ret = of_overlay_apply_dir(root, dir, true);
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2021-08-31 16:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 16:11 Ahmad Fatoum [this message]
2021-10-04 11:27 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210831161139.2988-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox