mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] boot: remove incomplete 'title' handling in menu
@ 2013-10-15 10:30 Sascha Hauer
  0 siblings, 0 replies; only message in thread
From: Sascha Hauer @ 2013-10-15 10:30 UTC (permalink / raw)
  To: barebox

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>
---
 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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-10-15 10:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-15 10:30 [PATCH] boot: remove incomplete 'title' handling in menu Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox