aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTomas Hozza <thozza@redhat.com>2012-11-27 02:56:33 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 13:41:46 -0500
commit40424f5fff65c7ae8763ca69ff3a9b8ddd8e2760 (patch)
treed8861fed3aa8d028e190d6a02fe5a58833714a2c /tools
parent10d498b13f73f6c171f974d32d231740e6fbb98c (diff)
tools/hv: Fix /var subdirectory
Initial patch by Ben Hutchings <ben@decadent.org.uk> We will install this in /usr, so it must use /var/lib for its state. Only programs installed under /opt should use /var/opt. Signed-off-by: Tomas Hozza <thozza@redhat.com> Acked-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/hv/hv_kvp_daemon.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index d25a46925e61..5c052dbcaf75 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -97,7 +97,7 @@ static struct utsname uts_buf;
97 * The location of the interface configuration file. 97 * The location of the interface configuration file.
98 */ 98 */
99 99
100#define KVP_CONFIG_LOC "/var/opt/" 100#define KVP_CONFIG_LOC "/var/lib/hyperv"
101 101
102#define MAX_FILE_NAME 100 102#define MAX_FILE_NAME 100
103#define ENTRIES_PER_BLOCK 50 103#define ENTRIES_PER_BLOCK 50
@@ -234,9 +234,9 @@ static int kvp_file_init(void)
234 int i; 234 int i;
235 int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK; 235 int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
236 236
237 if (access("/var/opt/hyperv", F_OK)) { 237 if (access(KVP_CONFIG_LOC, F_OK)) {
238 if (mkdir("/var/opt/hyperv", S_IRUSR | S_IWUSR | S_IROTH)) { 238 if (mkdir(KVP_CONFIG_LOC, S_IRUSR | S_IWUSR | S_IROTH)) {
239 syslog(LOG_ERR, " Failed to create /var/opt/hyperv"); 239 syslog(LOG_ERR, " Failed to create %s", KVP_CONFIG_LOC);
240 exit(EXIT_FAILURE); 240 exit(EXIT_FAILURE);
241 } 241 }
242 } 242 }
@@ -245,7 +245,7 @@ static int kvp_file_init(void)
245 fname = kvp_file_info[i].fname; 245 fname = kvp_file_info[i].fname;
246 records_read = 0; 246 records_read = 0;
247 num_blocks = 1; 247 num_blocks = 1;
248 sprintf(fname, "/var/opt/hyperv/.kvp_pool_%d", i); 248 sprintf(fname, "%s/.kvp_pool_%d", KVP_CONFIG_LOC, i);
249 fd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IROTH); 249 fd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IROTH);
250 250
251 if (fd == -1) 251 if (fd == -1)
@@ -1271,7 +1271,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
1271 */ 1271 */
1272 1272
1273 snprintf(if_file, sizeof(if_file), "%s%s%s", KVP_CONFIG_LOC, 1273 snprintf(if_file, sizeof(if_file), "%s%s%s", KVP_CONFIG_LOC,
1274 "hyperv/ifcfg-", if_name); 1274 "/ifcfg-", if_name);
1275 1275
1276 file = fopen(if_file, "w"); 1276 file = fopen(if_file, "w");
1277 1277