matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip netns: Create /var/run/netns dir when do 'ip netns monitor' 

netns monitor fails when there is no /var/run/netns dir
which might be created later while monitoring.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
This commit is contained in:
vadimk 2014-08-31 22:45:29 +03:00 committed by Stephen Hemminger
parent 9ecff68d11
commit c1cbb18adb
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ip/ipnetns.c
View File

@ -383,6 +383,20 @@ static int netns_delete(int argc, char **argv)
return 0; return 0;
} }
static int create_netns_dir(void)
{
/* Create the base netns directory if it doesn't exist */
if (mkdir(NETNS_RUN_DIR, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)) {
if (errno != EEXIST) {
fprintf(stderr, "mkdir %s failed: %s\n",
NETNS_RUN_DIR, strerror(errno));
return -1;
}
}
return 0;
}
static int netns_add(int argc, char **argv) static int netns_add(int argc, char **argv)
{ {
/* This function creates a new network namespace and /* This function creates a new network namespace and
@ -406,14 +420,8 @@ static int netns_add(int argc, char **argv)
snprintf(netns_path, sizeof(netns_path), "%s/%s", NETNS_RUN_DIR, name); snprintf(netns_path, sizeof(netns_path), "%s/%s", NETNS_RUN_DIR, name);
/* Create the base netns directory if it doesn't exist */ if (create_netns_dir())
if (mkdir(NETNS_RUN_DIR, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)) { return -1;
if (errno != EEXIST) {
fprintf(stderr, "mkdir %s failed: %s\n",
NETNS_RUN_DIR, strerror(errno));
return -1;
}
}
/* Make it possible for network namespace mounts to propagate between /* Make it possible for network namespace mounts to propagate between
* mount namespaces. This makes it likely that a unmounting a network * mount namespaces. This makes it likely that a unmounting a network
@ -476,6 +484,10 @@ static int netns_monitor(int argc, char **argv)
strerror(errno)); strerror(errno));
return -1; return -1;
} }
if (create_netns_dir())
return -1;
if (inotify_add_watch(fd, NETNS_RUN_DIR, IN_CREATE | IN_DELETE) < 0) { if (inotify_add_watch(fd, NETNS_RUN_DIR, IN_CREATE | IN_DELETE) < 0) {
fprintf(stderr, "inotify_add_watch failed: %s\n", fprintf(stderr, "inotify_add_watch failed: %s\n",
strerror(errno)); strerror(errno));