From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 4.mo5.mail-out.ovh.net ([178.33.111.247] helo=mo5.mail-out.ovh.net) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TFOBu-0008SP-SW for barebox@lists.infradead.org; Sat, 22 Sep 2012 11:48:15 +0000 Received: from mail404.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo5.mail-out.ovh.net (Postfix) with SMTP id B6AD6FF93E6 for ; Sat, 22 Sep 2012 13:54:04 +0200 (CEST) Date: Sat, 22 Sep 2012 13:45:39 +0200 From: Jean-Christophe PLAGNIOL-VILLARD Message-ID: <20120922114539.GU26553@game.jcrosoft.org> References: <1348311547.3917.6.camel@mars> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1348311547.3917.6.camel@mars> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 2/2] defaultenv-2: add nameserver IPs to kernel-parameter ip= To: Christoph Fritz Cc: barebox@lists.infradead.org On 12:59 Sat 22 Sep , Christoph Fritz wrote: > Due to lack of testing environment this patch is untested. > > Signed-off-by: Christoph Fritz > --- > 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