From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10]
	ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1UCYXd-00044X-Ew
	for ptxdist@pengutronix.de; Mon, 04 Mar 2013 17:47:09 +0100
Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1UCYXd-0006ka-E6
	for ptxdist@pengutronix.de; Mon, 04 Mar 2013 17:47:09 +0100
Date: Mon, 4 Mar 2013 17:47:09 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20130304164709.GX5360@pengutronix.de>
References: <1362410155-11831-1-git-send-email-jlu@pengutronix.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1362410155-11831-1-git-send-email-jlu@pengutronix.de>
Subject: Re: [ptxdist] [PATCH] dhcp client: comment out example options in
 dhclient.conf
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

On Mon, Mar 04, 2013 at 04:15:55PM +0100, Jan Luebbe wrote:
> The options are only intended as an example and should not be used
> unmodified.
> 

tnx, applied

Michael

> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> ---
>  generic/etc/dhclient.conf |   64 ++++++++++++++++++++++-----------------------
>  1 file changed, 32 insertions(+), 32 deletions(-)
> 
> diff --git a/generic/etc/dhclient.conf b/generic/etc/dhclient.conf
> index 147e004..6a994e6 100644
> --- a/generic/etc/dhclient.conf
> +++ b/generic/etc/dhclient.conf
> @@ -1,36 +1,36 @@
> -send host-name "andare.fugue.com";
> -send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
> -send dhcp-lease-time 3600;
> -supersede domain-name "fugue.com home.vix.com";
> -prepend domain-name-servers 127.0.0.1;
> +#send host-name "andare.fugue.com";
> +#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
> +#send dhcp-lease-time 3600;
> +#supersede domain-name "fugue.com home.vix.com";
> +#prepend domain-name-servers 127.0.0.1;
>  request subnet-mask, broadcast-address, time-offset, routers,
>  	domain-name, domain-name-servers, host-name;
> -require subnet-mask, domain-name-servers;
> -timeout 60;
> -retry 60;
> -reboot 10;
> -select-timeout 5;
> -initial-interval 2;
> -script "/etc/dhclient-script";
> -media "-link0 -link1 -link2", "link0 link1";
> -reject 192.33.137.209;
> +#require subnet-mask, domain-name-servers;
> +#timeout 60;
> +#retry 60;
> +#reboot 10;
> +#select-timeout 5;
> +#initial-interval 2;
> +#script "/etc/dhclient-script";
> +#media "-link0 -link1 -link2", "link0 link1";
> +#reject 192.33.137.209;
>  
> -alias {
> -  interface "ep0";
> -  fixed-address 192.5.5.213;
> -  option subnet-mask 255.255.255.255;
> -}
> +#alias {
> +#  interface "ep0";
> +#  fixed-address 192.5.5.213;
> +#  option subnet-mask 255.255.255.255;
> +#}
>  
> -lease {
> -  interface "ep0";
> -  fixed-address 192.33.137.200;
> -  medium "link0 link1";
> -  option host-name "andare.swiftmedia.com";
> -  option subnet-mask 255.255.255.0;
> -  option broadcast-address 192.33.137.255;
> -  option routers 192.33.137.250;
> -  option domain-name-servers 127.0.0.1;
> -  renew 2 2000/1/12 00:00:01;
> -  rebind 2 2000/1/12 00:00:01;
> -  expire 2 2000/1/12 00:00:01;
> -}
> +#lease {
> +#  interface "ep0";
> +#  fixed-address 192.33.137.200;
> +#  medium "link0 link1";
> +#  option host-name "andare.swiftmedia.com";
> +#  option subnet-mask 255.255.255.0;
> +#  option broadcast-address 192.33.137.255;
> +#  option routers 192.33.137.250;
> +#  option domain-name-servers 127.0.0.1;
> +#  renew 2 2000/1/12 00:00:01;
> +#  rebind 2 2000/1/12 00:00:01;
> +#  expire 2 2000/1/12 00:00:01;
> +#}
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
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 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de