From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] boot: remove incomplete 'title' handling in menu
Date: Tue, 15 Oct 2013 12:30:08 +0200 [thread overview]
Message-ID: <1381833008-1892-1-git-send-email-s.hauer@pengutronix.de> (raw)
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
reply other threads:[~2013-10-15 10:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1381833008-1892-1-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@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