2 files changed, 8 insertions, 8 deletions

diff --git a/tools/hv/Makefile b/tools/hv/Makefile
index bd22f786a60c..99ffe61051a7 100644
--- a/tools/hv/Makefile
+++ b/tools/hv/Makefile
@@ -5,9 +5,9 @@ PTHREAD_LIBS = -lpthread
 WARNINGS = -Wall -Wextra
 CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS)
 
-all: hv_kvp_daemon hv_vss_daemon
+all: hv_kvp_daemon hv_vss_daemon hv_fcopy_daemon
 %: %.c
         $(CC) $(CFLAGS) -o $@ $^
 
 clean:
-        $(RM) hv_kvp_daemon hv_vss_daemon
+        $(RM) hv_kvp_daemon hv_vss_daemon hv_fcopy_daemon
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 6a6432a20a1d..4b3ee3521bde 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -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);
 
         /*