mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] net: dhcp: add support to send the hostname to the dhcp server
Date: Wed, 18 Apr 2012 12:05:05 +0200	[thread overview]
Message-ID: <20120418100505.GQ3852@pengutronix.de> (raw)
In-Reply-To: <1334462739-17265-1-git-send-email-plagnioj@jcrosoft.com>

Applied 1/3v2 and 3/3. I didn't apply 2/ for reasons mentioned.

Sascha

On Sun, Apr 15, 2012 at 06:05:37AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  net/dhcp.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/net/dhcp.c b/net/dhcp.c
> index 0116ba4..c3c41a0 100644
> --- a/net/dhcp.c
> +++ b/net/dhcp.c
> @@ -237,6 +237,7 @@ static int dhcp_set_string_options(struct dhcp_param *param, u8 *e)
>  	return str_len + 2;
>  }
>  
> +#define DHCP_HOSTNAME		12
>  #define DHCP_VENDOR_ID		60
>  #define DHCP_CLIENT_ID		61
>  #define DHCP_USER_CLASS		77
> @@ -244,6 +245,10 @@ static int dhcp_set_string_options(struct dhcp_param *param, u8 *e)
>  
>  struct dhcp_param dhcp_params[] = {
>  	{
> +		.option = DHCP_HOSTNAME,
> +		.handle = dhcp_set_string_options,
> +		.barebox_var_name = "hostname",
> +	}, {
>  		.option = DHCP_VENDOR_ID,
>  		.handle = dhcp_set_string_options,
>  		.barebox_var_name = "dhcp_vendor_id",
> @@ -614,8 +619,10 @@ static int do_dhcp(int argc, char *argv[])
>  
>  	dhcp_reset_env();
>  
> -	while((opt = getopt(argc, argv, "v:c:u:U:")) > 0) {
> +	while((opt = getopt(argc, argv, "h:v:c:u:U:")) > 0) {
>  		switch(opt) {
> +		case 'U':
> +			dhcp_set_param_data(DHCP_HOSTNAME, optarg);
>  		case 'v':
>  			dhcp_set_param_data(DHCP_VENDOR_ID, optarg);
>  			break;
> @@ -698,7 +705,7 @@ BAREBOX_CMD_END
>  
>  BAREBOX_MAGICVAR(bootfile, "bootfile returned from DHCP request");
>  BAREBOX_MAGICVAR(nameserver, "Nameserver returned from DHCP request");
> -BAREBOX_MAGICVAR(hostname, "hostname returned from DHCP request");
> +BAREBOX_MAGICVAR(hostname, "hostname to send or returned from DHCP request");
>  BAREBOX_MAGICVAR(domainname, "domainname returned from DHCP request");
>  BAREBOX_MAGICVAR(rootpath, "rootpath returned from DHCP request");
>  BAREBOX_MAGICVAR(dhcp_vendor_id, "vendor id to send to the DHCP server");
> -- 
> 1.7.9.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

      parent reply	other threads:[~2012-04-18 10:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-15  4:05 Jean-Christophe PLAGNIOL-VILLARD
2012-04-15  4:05 ` [PATCH 2/3] net: dhcp: allow to user env var as user class too Jean-Christophe PLAGNIOL-VILLARD
2012-04-15 16:57   ` Sascha Hauer
2012-04-15 16:49     ` Jean-Christophe PLAGNIOL-VILLARD
2012-04-15  4:05 ` [PATCH 3/3] config: switch machine to hostname Jean-Christophe PLAGNIOL-VILLARD
2012-04-15  7:51 ` [PATCH 1/3] net: dhcp: add support to send the hostname to the dhcp server Baruch Siach
2012-04-15 13:27 ` [PATCH 1/3 v2] " Jean-Christophe PLAGNIOL-VILLARD
2012-04-18 10:05 ` Sascha Hauer [this message]

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=20120418100505.GQ3852@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=plagnioj@jcrosoft.com \
    /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