[PATCH 4/7] bootchooser: allow an empty namespace
Juergen Borleis
jbe at pengutronix.de
Tue Aug 15 06:46:33 PDT 2017
The bootchooser's documentation states the 'namespace' for the state
storage backend is optional. This change makes it really optional to allow
a flat state variable set definition for the 'bootchooser' as well.
Signed-off-by: Juergen Borleis <jbe at pengutronix.de>
---
common/bootchooser.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/common/bootchooser.c b/common/bootchooser.c
index 69d980d6f..83b15e0f7 100644
--- a/common/bootchooser.c
+++ b/common/bootchooser.c
@@ -367,12 +367,10 @@ struct bootchooser *bootchooser_get(void)
char *state_devname;
delim = strchr(state_prefix, '.');
- if (!delim) {
- pr_err("state_prefix '%s' has invalid format\n",
- state_prefix);
- goto err;
- }
- state_devname = xstrndup(state_prefix, delim - state_prefix);
+ if (delim)
+ state_devname = xstrndup(state_prefix, delim - state_prefix);
+ else
+ state_devname = xstrdup(state_prefix);
bc->state_prefix = xstrdup(state_prefix);
bc->state = state_by_name(state_devname);
if (!bc->state) {
--
2.11.0
More information about the barebox
mailing list