From 1288f65b3bf4c69eac7b950364824a5bd177dd97 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 18 May 2016 16:01:15 -0700 Subject: [PATCH] HACK: libnetutils: Remove parameters from dhcpcd service call init is not accepting parameters, therefore adding them will cause to serivce failure. This is a temporary solution. Change-Id: I0faa482f76b5af5f91723b0d4ef348aafd5694df Signed-off-by: Dmitry Shmidt --- libnetutils/dhcp_utils.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c index c6b9fe491..56e1d597b 100644 --- a/libnetutils/dhcp_utils.c +++ b/libnetutils/dhcp_utils.c @@ -243,12 +243,8 @@ int dhcp_start(const char *interface) property_set(result_prop_name, ""); /* Start the daemon and wait until it's ready */ - if (property_get(HOSTNAME_PROP_NAME, prop_value, NULL) && (prop_value[0] != '\0')) - snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-f %s -h %s %s", DAEMON_NAME, - p2p_interface, DHCP_CONFIG_PATH, prop_value, interface); - else - snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-f %s %s", DAEMON_NAME, - p2p_interface, DHCP_CONFIG_PATH, interface); + snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, + p2p_interface); memset(prop_value, '\0', PROPERTY_VALUE_MAX); property_set(ctrl_prop, daemon_cmd); if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) { @@ -288,7 +284,8 @@ int dhcp_stop(const char *interface) DAEMON_PROP_NAME, p2p_interface); - snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, p2p_interface); + snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, + p2p_interface); /* Stop the daemon and wait until it's reported to be stopped */ property_set(ctrl_prop, daemon_cmd); @@ -317,7 +314,8 @@ int dhcp_release_lease(const char *interface) DAEMON_PROP_NAME, p2p_interface); - snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, p2p_interface); + snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, + p2p_interface); /* Stop the daemon and wait until it's reported to be stopped */ property_set(ctrl_prop, daemon_cmd); @@ -357,8 +355,8 @@ int dhcp_start_renew(const char *interface) property_set(result_prop_name, ""); /* Start the renew daemon and wait until it's ready */ - snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:%s", DAEMON_NAME_RENEW, - p2p_interface, interface); + snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME_RENEW, + p2p_interface); memset(prop_value, '\0', PROPERTY_VALUE_MAX); property_set(ctrl_prop, daemon_cmd);