Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 787d6182 authored by Dexuan Cui's avatar Dexuan Cui Committed by Greg Kroah-Hartman
Browse files

tools: hv: kvp_daemon: make IPv6-only-injection work 



In the case the host only injects an IPv6 address, the dhcp_enabled flag is
true (it's only for IPv4 according to Hyper-V host team), but we still need to
proceed to parse the IPv6 information.

Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarDexuan Cui <decui@microsoft.com>
Reviewed-By: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 87712bf8

tools/hv/hv_kvp_daemon.c

+6 −6
Original line number Diff line number Diff line
@@ -1308,16 +1308,17 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) 
	if (error)

		goto setval_error;



	/*

	 * The dhcp_enabled flag is only for IPv4. In the case the host only

	 * injects an IPv6 address, the flag is true, but we still need to

	 * proceed to parse and pass the IPv6 information to the

	 * disto-specific script hv_set_ifconfig.

	 */

	if (new_val->dhcp_enabled) {

		error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");

		if (error)

			goto setval_error;



		/*

		 * We are done!.

		 */

		goto setval_done;



	} else {

		error = kvp_write_file(file, "BOOTPROTO", "", "none");

		if (error)
@@ -1345,7 +1346,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) 
	if (error)

		goto setval_error;



setval_done:

	fclose(file);



	/*