RE: [PATCH 1/3] tools/hv: Fix /var subdirectory

[KY Srinivasan]

> -----Original Message-----
> From: Tomas Hozza [mailto:thozza@xxxxxxxxxx]
> Sent: Monday, November 12, 2012 3:55 AM
> To: gregkh@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx;
> devel@xxxxxxxxxxxxxxxxxxxxxx; olaf@xxxxxxxxx; apw@xxxxxxxxxxxxx;
> jasowang@xxxxxxxxxx; KY Srinivasan; ben@xxxxxxxxxxxxxxx
> Cc: Tomas Hozza
> Subject: [PATCH 1/3] tools/hv: Fix /var subdirectory
> 
> Initial patch by Ben Hutchings <ben@xxxxxxxxxxxxxxx>
> 
> 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@xxxxxxxxxx>
Acked-by:  K. Y. Srinivasan <kys@xxxxxxxxxxxxx>


> ---
>  tools/hv/hv_kvp_daemon.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index 54ecb95..d80a612 100644
> --- a/tools/hv/hv_kvp_daemon.c
> +++ b/tools/hv/hv_kvp_daemon.c
> @@ -98,7 +98,7 @@ static struct utsname uts_buf;
>   * The location of the interface configuration file.
>   */
> 
> -#define KVP_CONFIG_LOC	"/var/opt/"
> +#define KVP_CONFIG_LOC	"/var/lib/hyperv"
> 
>  #define MAX_FILE_NAME 100
>  #define ENTRIES_PER_BLOCK 50
> @@ -235,9 +235,9 @@ static int kvp_file_init(void)
>  	int i;
>  	int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
> 
> -	if (access("/var/opt/hyperv", F_OK)) {
> -		if (mkdir("/var/opt/hyperv", S_IRUSR | S_IWUSR | S_IROTH)) {
> -			syslog(LOG_ERR, " Failed to create /var/opt/hyperv");
> +	if (access(KVP_CONFIG_LOC, F_OK)) {
> +		if (mkdir(KVP_CONFIG_LOC, S_IRUSR | S_IWUSR | S_IROTH)) {
> +			syslog(LOG_ERR, " Failed to create %s",
> KVP_CONFIG_LOC);
>  			exit(EXIT_FAILURE);
>  		}
>  	}
> @@ -246,7 +246,7 @@ static int kvp_file_init(void)
>  		fname = kvp_file_info[i].fname;
>  		records_read = 0;
>  		num_blocks = 1;
> -		sprintf(fname, "/var/opt/hyperv/.kvp_pool_%d", i);
> +		sprintf(fname, "%s/.kvp_pool_%d", KVP_CONFIG_LOC, i);
>  		fd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR |
> S_IROTH);
> 
>  		if (fd == -1)
> @@ -1263,7 +1263,7 @@ static int kvp_set_ip_info(char *if_name, struct
> hv_kvp_ipaddr_value *new_val)
>  	 */
> 
>  	snprintf(if_file, sizeof(if_file), "%s%s%s", KVP_CONFIG_LOC,
> -		"hyperv/ifcfg-", if_name);
> +		"/ifcfg-", if_name);
> 
>  	file = fopen(if_file, "w");
> 
> --
> 1.7.11.7



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/