* [PATCH 2/2] defaultenv-2: add nameserver IPs to kernel-parameter ip=
@ 2012-09-22 10:59 Christoph Fritz
2012-09-22 11:45 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Fritz @ 2012-09-22 10:59 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
Due to lack of testing environment this patch is untested.
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
---
defaultenv-2/base/bin/bootargs-ip | 4 +++-
defaultenv-2/base/bin/bootargs-ip-barebox | 5 ++++-
defaultenv-2/base/bin/ifup | 4 ++++
defaultenv-2/base/network/eth0 | 2 ++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/defaultenv-2/base/bin/bootargs-ip b/defaultenv-2/base/bin/bootargs-ip
index 2d4486c..53623853 100644
--- a/defaultenv-2/base/bin/bootargs-ip
+++ b/defaultenv-2/base/bin/bootargs-ip
@@ -7,5 +7,7 @@
if [ $ip = dhcp ]; then
global.linux.bootargs.dyn.ip="ip=dhcp"
else
- global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:"
+ global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0::"
+ global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver0:"
+ global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver1"
fi
diff --git a/defaultenv-2/base/bin/bootargs-ip-barebox b/defaultenv-2/base/bin/bootargs-ip-barebox
index 5a3b984..09f42a8 100644
--- a/defaultenv-2/base/bin/bootargs-ip-barebox
+++ b/defaultenv-2/base/bin/bootargs-ip-barebox
@@ -4,4 +4,7 @@
ifup eth0
-global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"
+global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:"
+global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.netmask::eth0::"
+global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver0:"
+global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver1"
diff --git a/defaultenv-2/base/bin/ifup b/defaultenv-2/base/bin/ifup
index 37b986c..fe5a242 100644
--- a/defaultenv-2/base/bin/ifup
+++ b/defaultenv-2/base/bin/ifup
@@ -26,6 +26,8 @@ netmask=
gateway=
serverip=
ethaddr=
+nameserver0=
+nameserver1=
. $cmd
@@ -51,6 +53,8 @@ if [ "$ip" = static ]; then
${interface}.netmask=$netmask
${interface}.serverip=$serverip
${interface}.gateway=$gateway
+ ${interface}.nameserver0=$nameserver0
+ ${interface}.nameserver1=$nameserver1
ret=0
elif [ "$ip" = dhcp ]; then
dhcp
diff --git a/defaultenv-2/base/network/eth0 b/defaultenv-2/base/network/eth0
index 7e731ca..2ed64ca 100644
--- a/defaultenv-2/base/network/eth0
+++ b/defaultenv-2/base/network/eth0
@@ -9,6 +9,8 @@ ipaddr=
netmask=
gateway=
serverip=
+nameserver0=
+nameserver1=
# MAC address if needed
#ethaddr=xx:xx:xx:xx:xx:xx
--
1.7.2.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2/2] defaultenv-2: add nameserver IPs to kernel-parameter ip=
2012-09-22 10:59 [PATCH 2/2] defaultenv-2: add nameserver IPs to kernel-parameter ip= Christoph Fritz
@ 2012-09-22 11:45 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-22 16:06 ` Christoph Fritz
0 siblings, 1 reply; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-22 11:45 UTC (permalink / raw)
To: Christoph Fritz; +Cc: barebox
On 12:59 Sat 22 Sep , Christoph Fritz wrote:
> Due to lack of testing environment this patch is untested.
>
> Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
> ---
> defaultenv-2/base/bin/bootargs-ip | 4 +++-
> defaultenv-2/base/bin/bootargs-ip-barebox | 5 ++++-
> defaultenv-2/base/bin/ifup | 4 ++++
> defaultenv-2/base/network/eth0 | 2 ++
> 4 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/defaultenv-2/base/bin/bootargs-ip b/defaultenv-2/base/bin/bootargs-ip
> index 2d4486c..53623853 100644
> --- a/defaultenv-2/base/bin/bootargs-ip
> +++ b/defaultenv-2/base/bin/bootargs-ip
> @@ -7,5 +7,7 @@
> if [ $ip = dhcp ]; then
> global.linux.bootargs.dyn.ip="ip=dhcp"
> else
> - global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:"
> + global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0::"
> + global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver0:"
> + global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver1"
keep it on one line for grepping
> fi
> diff --git a/defaultenv-2/base/bin/bootargs-ip-barebox b/defaultenv-2/base/bin/bootargs-ip-barebox
> index 5a3b984..09f42a8 100644
> --- a/defaultenv-2/base/bin/bootargs-ip-barebox
> +++ b/defaultenv-2/base/bin/bootargs-ip-barebox
> @@ -4,4 +4,7 @@
>
> ifup eth0
>
> -global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"
> +global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:"
> +global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.netmask::eth0::"
> +global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver0:"
> +global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver1"
> diff --git a/defaultenv-2/base/bin/ifup b/defaultenv-2/base/bin/ifup
> index 37b986c..fe5a242 100644
> --- a/defaultenv-2/base/bin/ifup
> +++ b/defaultenv-2/base/bin/ifup
> @@ -26,6 +26,8 @@ netmask=
> gateway=
> serverip=
> ethaddr=
> +nameserver0=
> +nameserver1=
>
> . $cmd
>
> @@ -51,6 +53,8 @@ if [ "$ip" = static ]; then
> ${interface}.netmask=$netmask
> ${interface}.serverip=$serverip
> ${interface}.gateway=$gateway
> + ${interface}.nameserver0=$nameserver0
> + ${interface}.nameserver1=$nameserver1
and this is not interface specific net.nameserver
and dhcp??
Best Regards,
J.
> ret=0
> elif [ "$ip" = dhcp ]; then
> dhcp
> diff --git a/defaultenv-2/base/network/eth0 b/defaultenv-2/base/network/eth0
> index 7e731ca..2ed64ca 100644
> --- a/defaultenv-2/base/network/eth0
> +++ b/defaultenv-2/base/network/eth0
> @@ -9,6 +9,8 @@ ipaddr=
> netmask=
> gateway=
> serverip=
> +nameserver0=
> +nameserver1=
>
> # MAC address if needed
> #ethaddr=xx:xx:xx:xx:xx:xx
> --
> 1.7.2.5
>
>
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2/2] defaultenv-2: add nameserver IPs to kernel-parameter ip=
2012-09-22 11:45 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-09-22 16:06 ` Christoph Fritz
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Fritz @ 2012-09-22 16:06 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
Hi Jean-Christophe
On Sat, Sep 22, 2012 at 01:45:39PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 12:59 Sat 22 Sep , Christoph Fritz wrote:
> > --- a/defaultenv-2/base/bin/bootargs-ip
> > +++ b/defaultenv-2/base/bin/bootargs-ip
> > @@ -7,5 +7,7 @@
> > if [ $ip = dhcp ]; then
> > global.linux.bootargs.dyn.ip="ip=dhcp"
> > else
> > - global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:"
> > + global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0::"
> > + global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver0:"
> > + global.linux.bootargs.dyn.ip="$global.linux.bootargs.dyn.ip$eth0.nameserver1"
> keep it on one line for grepping
ok
> > diff --git a/defaultenv-2/base/bin/ifup b/defaultenv-2/base/bin/ifup
> > index 37b986c..fe5a242 100644
> > --- a/defaultenv-2/base/bin/ifup
> > +++ b/defaultenv-2/base/bin/ifup
> > @@ -26,6 +26,8 @@ netmask=
> > gateway=
> > serverip=
> > ethaddr=
> > +nameserver0=
> > +nameserver1=
> >
> > . $cmd
> >
> > @@ -51,6 +53,8 @@ if [ "$ip" = static ]; then
> > ${interface}.netmask=$netmask
> > ${interface}.serverip=$serverip
> > ${interface}.gateway=$gateway
> > + ${interface}.nameserver0=$nameserver0
> > + ${interface}.nameserver1=$nameserver1
>
> and this is not interface specific net.nameserver
>
> and dhcp??
When kernel-parameter "ip=dhcp" you can't set stuff like netmask, ip,
or nameservers.
As stated in the commit message, due to current lack of a
env-2 testing environment, I'm not sure how to implement the
following snippet from env-1 in env-2:
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 4e2056e..61287d5 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -61,7 +61,7 @@ if [ x$ip = xdhcp -o ]; then
elif [ x$ip = xnone ]; then
bootargs="$bootargs ip=none"
else
- bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"
+ bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0::$net.nameserver0:$net.nameserver1"
fi
diff --git a/defaultenv/config b/defaultenv/config
index 391ba47..38fab40 100644
--- a/defaultenv/config
+++ b/defaultenv/config
@@ -18,6 +18,8 @@ global.dhcp.vendor_id=barebox
#eth0.netmask=a.b.c.d
#eth0.serverip=a.b.c.d
#eth0.gateway=a.b.c.d
++#net.nameserver0=a.b.c.d
++#net.nameserver1=a.b.c.d
# can be either 'tftp', 'nfs', 'nand', 'nor' or 'disk'
kernel_loc=tftp
--
Thanks,
-- Christoph
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-22 16:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-22 10:59 [PATCH 2/2] defaultenv-2: add nameserver IPs to kernel-parameter ip= Christoph Fritz
2012-09-22 11:45 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-22 16:06 ` Christoph Fritz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox