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

From: KY Srinivasan
Date: Fri Nov 09 2012 - 10:56:46 EST




> -----Original Message-----
> From: Tomas Hozza [mailto:thozza@xxxxxxxxxx]
> Sent: Friday, November 09, 2012 9:01 AM
> To: olaf@xxxxxxxxx; KY Srinivasan; gregkh@xxxxxxxxxxxxxxxxxxx; linux-
> kernel@xxxxxxxxxxxxxxx; devel@xxxxxxxxxxxxxxxxxxxxxx; apw@xxxxxxxxxxxxx;
> jasowang@xxxxxxxxxx; 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>
> ---
> tools/hv/hv_kvp_daemon.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index 54ecb95..d9b3a74 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/"
>
> #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("/var/lib/hyperv", F_OK)) {
> + if (mkdir("/var/lib/hyperv", S_IRUSR | S_IWUSR | S_IROTH)) {
> + syslog(LOG_ERR, " Failed to create /var/lib/hyperv");

Why don't you use the macro defined earlier for the path for /var/lib. Why
not include the hyperv directory as well in the macro.

Regards,

K. Y
> 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, "/var/lib/hyperv/.kvp_pool_%d", i);
> fd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR |
> S_IROTH);
>
> if (fd == -1)
> --
> 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/