[PATCH] boot: remove incomplete 'title' handling in menu
Sascha Hauer
s.hauer at pengutronix.de
Tue Oct 15 06:30:08 EDT 2013
The 'boot -m' command executes the /env/boot/* scripts in order to
determine the title of a boot menu entry. This is not complete and
depends on changes in the environment, so remove it for now.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
commands/boot.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/commands/boot.c b/commands/boot.c
index 7850805..8105889 100644
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -57,11 +57,10 @@ static void bootsource_action(struct menu *m, struct menu_entry *me)
static int bootsources_menu_env_entries(struct blspec *blspec)
{
- const char *path = "/env/boot", *title;
+ const char *path = "/env/boot";
DIR *dir;
struct dirent *d;
struct blspec_entry *be;
- char *cmd;
dir = opendir(path);
if (!dir)
@@ -75,17 +74,7 @@ static int bootsources_menu_env_entries(struct blspec *blspec)
be = blspec_entry_alloc(blspec);
be->me.type = MENU_ENTRY_NORMAL;
be->scriptpath = asprintf("/env/boot/%s", d->d_name);
-
- cmd = asprintf(". %s menu", be->scriptpath);
- setenv("title", "");
- run_command(cmd, 0);
- free(cmd);
- title = getenv("title");
-
- if (title)
- be->me.display = xstrdup(title);
- else
- be->me.display = xstrdup(d->d_name);
+ be->me.display = xstrdup(d->d_name);
}
closedir(dir);
--
1.8.4.rc3
More information about the barebox
mailing list