Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753072AbcLCSlr (ORCPT ); Sat, 3 Dec 2016 13:41:47 -0500 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:46870 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751400AbcLCSjp (ORCPT ); Sat, 3 Dec 2016 13:39:45 -0500 x-originating-ip: 72.167.245.219 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com Cc: Alex Fluter , "K. Y. Srinivasan" Subject: [PATCH V2 14/15] Tools: hv: kvp: configurable external scripts path Date: Sat, 3 Dec 2016 12:34:41 -0800 Message-Id: <1480797282-10126-14-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1480797282-10126-1-git-send-email-kys@exchange.microsoft.com> References: <1480797239-10085-1-git-send-email-kys@exchange.microsoft.com> <1480797282-10126-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfGkCmaAYs4o9TXezJbNJ/A4gUGxxtISn7iVopWdjDy08s905ldBypLwgc3oGxF3gCBww1P+WKL8cf5LUkcUGpCqlVb866JEPzV3M+CPHPDxsrxBRP8p5 PnjgmeDsWqAJrZZV4amf6nWxDynzhEl/dwJ1jHkCd4aXnbM5sWebuXf2IwW29W98hGtdCS3qrc0XK5KsrHC9sXmm8SF2LzAE7VGlHJ4Z+Z4Iags/DPItI11e 7BUnQQKmPe1J8eINwHouX+M91rz+oPRBuyyToYOxOyrnnvBcWuiDvBCqJfVYdiari11iVO9QtmTXtYKJp7uMeA0FUqf/bIJ6COcMQHUWRQZdYSPz2UgF2X4x sJKxjJWgL5eMHdqOQ1sAGA65ID58Edg384BHZ/RXyKWziKLxcAGYvsm2pUIHLs52arrHwZ/8f0HGupl/+MCNYPWbNXgarBeETiUb+BeNVFJtCMiF+z1ci/4I Akk0Rchagll6vXLr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1878 Lines: 64 From: Alex Fluter error when running hypervkvpd: $ sudo ./hv_kvp_daemon -n sh: hv_get_dns_info: command not found sh: hv_get_dhcp_info: command not found sh: hv_get_dns_info: command not found sh: hv_get_dhcp_info: command not found The external scripts are not installed in system path, adding a configurable macro. Signed-off-by: Alex Fluter Signed-off-by: K. Y. Srinivasan --- tools/hv/hv_kvp_daemon.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index d791dbf..f1758fc 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -93,6 +93,10 @@ enum { #define KVP_CONFIG_LOC "/var/lib/hyperv" +#ifndef KVP_SCRIPTS_PATH +#define KVP_SCRIPTS_PATH "/usr/libexec/hypervkvpd/" +#endif + #define MAX_FILE_NAME 100 #define ENTRIES_PER_BLOCK 50 @@ -818,7 +822,7 @@ static void kvp_get_ipconfig_info(char *if_name, * . */ - sprintf(cmd, "%s", "hv_get_dns_info"); + sprintf(cmd, KVP_SCRIPTS_PATH "%s", "hv_get_dns_info"); /* * Execute the command to gather DNS info. @@ -835,7 +839,7 @@ static void kvp_get_ipconfig_info(char *if_name, * Enabled: DHCP enabled. */ - sprintf(cmd, "%s %s", "hv_get_dhcp_info", if_name); + sprintf(cmd, KVP_SCRIPTS_PATH "%s %s", "hv_get_dhcp_info", if_name); file = popen(cmd, "r"); if (file == NULL) @@ -1341,7 +1345,8 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) * invoke the external script to do its magic. */ - snprintf(cmd, sizeof(cmd), "%s %s", "hv_set_ifconfig", if_file); + snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s", + "hv_set_ifconfig", if_file); if (system(cmd)) { syslog(LOG_ERR, "Failed to execute cmd '%s'; error: %d %s", cmd, errno, strerror(errno)); -- 1.7.4.1