diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-15 12:28:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-16 09:31:52 +0200 |
| commit | 0ce908358260db4de67a6f5e9e27f97da6e22c3f (patch) | |
| tree | 79ce55f9765c7e2546e302ae6c50fb7175819ba9 | |
| parent | 579cbebf411f5069960c52705167bd18e3b7b52b (diff) | |
| download | barebox-0ce908358260db4de67a6f5e9e27f97da6e22c3f.tar.gz barebox-0ce908358260db4de67a6f5e9e27f97da6e22c3f.tar.xz | |
boot: remove incomplete 'title' handling in menu
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@pengutronix.de>
| -rw-r--r-- | commands/boot.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/commands/boot.c b/commands/boot.c index 78508056e6..810588931b 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); |