mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] defenv-2: source /env/config after /env/init/*
Date: Fri, 25 Jan 2013 10:37:30 +0100	[thread overview]
Message-ID: <1359106650-12290-1-git-send-email-m.olbrich@pengutronix.de> (raw)

This way variables in /env/config can actually overwrite things from
e.g. /env/init/config-board.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---

This is really confusing right now. The comment in config-board says
"Change /env/config instead" and that doesn't work.

I'd like to see this in master as well, but that only works if these
commits are applied first:

f19a924 defaultenv-2: move ps1 to base/init/ps1
b26c1c3 defaultenv-2: execute init/* before timeout

otherwise global.autoboot_timeout and global.allow_color are set too late.

Michael

 defaultenv-2/base/bin/init |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
index b606b63..4a1b22e 100644
--- a/defaultenv-2/base/bin/init
+++ b/defaultenv-2/base/bin/init
@@ -13,8 +13,6 @@ global linux.bootargs.dyn.ip
 global linux.bootargs.dyn.root
 global editcmd=sedit
 
-/env/config
-
 if [ -e /env/menu ]; then
 	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
 else
@@ -33,6 +31,8 @@ for i in /env/init/*; do
 	. $i
 done
 
+/env/config
+
 timeout -a $global.autoboot_timeout -v key
 autoboot="$?"
 
-- 
1.7.10.4


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

             reply	other threads:[~2013-01-25  9:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-25  9:37 Michael Olbrich [this message]
2013-01-25 18:00 ` Sascha Hauer

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=1359106650-12290-1-git-send-email-m.olbrich@pengutronix.de \
    --to=m.olbrich@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