[PATCH] defaultenv-2: fix base/init/ps1: don't reload /env/config

[PATCH] defaultenv-2: fix base/init/ps1: don't reload /env/config

[Fabio Porcedda]

Remove the load of /env/config because is already done by /bin/init,
so it doesn't overwrite any changes done by previous /init/* scripts that
are loaded by /bin/init.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 defaultenv-2/base/init/ps1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/defaultenv-2/base/init/ps1 b/defaultenv-2/base/init/ps1
index fcbf4b6..02d7b4b 100644
--- a/defaultenv-2/base/init/ps1
+++ b/defaultenv-2/base/init/ps1
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-/env/config
-
 if [ ${global.allow_color} = "true" ]; then
         export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
 else
-- 
1.8.1.1


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

Re: [PATCH] defaultenv-2: fix base/init/ps1: don't reload /env/config

[Sascha Hauer]

On Thu, Feb 21, 2013 at 10:33:04AM +0100, Fabio Porcedda wrote:
> Remove the load of /env/config because is already done by /bin/init,
> so it doesn't overwrite any changes done by previous /init/* scripts that
> are loaded by /bin/init.
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied, thanks

Sascha

> ---
>  defaultenv-2/base/init/ps1 | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/defaultenv-2/base/init/ps1 b/defaultenv-2/base/init/ps1
> index fcbf4b6..02d7b4b 100644
> --- a/defaultenv-2/base/init/ps1
> +++ b/defaultenv-2/base/init/ps1
> @@ -1,7 +1,5 @@
>  #!/bin/sh
>  
> -/env/config
> -
>  if [ ${global.allow_color} = "true" ]; then
>          export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
>  else
> -- 
> 1.8.1.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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