[devel] set hostname in propagator

["Michael A. Kangin" <mak@complife.ru>]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

Здравствуйте.

Озаботился тут установкой hostname, полученного по dhcp, в пропагаторе. 
Накатал патчик (см. аттач), вроде с виду все хорошо, пишет в логах:
got hostname term-pg01
set hostname term-pg01

Однако, в итогово-загруженной системе hostname оказывается просто term.

Из-за чего такое может быть, как бы пофиксить?

-- 
wbr, Michael A. Kangin

[-- Attachment #2: sethostname.patch --]
[-- Type: text/x-patch, Size: 1935 bytes --]

commit cee3c82eb493b5722dab8df94ed43c89507f2412
Author: Michael A. Kangin <prividen@altlinux.org>
Date:   Fri Aug 24 01:15:41 2012 +0400

    fix hostnames

diff --git a/dhcp.c b/dhcp.c
index f903340..874f571 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -208,6 +208,7 @@ static void parse_reply(struct bootp_request * breq, struct interface_info * int
 {
 	unsigned char * chptr;
 	unsigned char option, length;
+	int retcode;
 
 	memcpy(&intf->ip, &breq->yiaddr, 4);
 	memcpy(&next_server, &breq->server_ip, 4);
@@ -243,6 +244,12 @@ static void parse_reply(struct bootp_request * breq, struct interface_info * int
 			tmp_str[length] = '\0';
 			domain = strdup(tmp_str);
 			log_message("got domain %s", domain);
+			retcode = setdomainname(domain, sizeof(domain));
+			if (retcode == 0) 
+				log_message("set domain %s", domain);
+			else
+				log_message("could not set domain %s with ret %d", domain, retcode);
+
 			break;
 
 		case BOOTP_OPTION_BROADCAST:
@@ -260,6 +267,12 @@ static void parse_reply(struct bootp_request * breq, struct interface_info * int
 			tmp_str[length] = '\0';
 			hostname = strdup(tmp_str);
 			log_message("got hostname %s", hostname);
+			retcode = sethostname(hostname, sizeof(hostname));
+			if (retcode == 0) 
+				log_message("set hostname %s", hostname);
+			else
+				log_message("could not set hostname %s with ret %d", hostname, retcode);
+
 			break;
 
 		case BOOTP_OPTION_ROOTPATH:
@@ -591,6 +604,7 @@ enum return_type perform_dhcp(struct interface_info * intf)
 	requested_options[num_options++] = BOOTP_OPTION_GATEWAY;
 	requested_options[num_options++] = BOOTP_OPTION_DNS;
 	requested_options[num_options++] = BOOTP_OPTION_DOMAIN;
+	requested_options[num_options++] = BOOTP_OPTION_HOSTNAME;
 	requested_options[num_options++] = BOOTP_OPTION_ROOTPATH;
 	requested_options[num_options++] = BOOTP_OPTION_BROADCAST;
 	add_vendor_code(&breq, DHCP_OPTION_OPTIONREQ, num_options, requested_options);