Commit fd5bcbe7 authored by Pavel Emelyanov's avatar Pavel Emelyanov

check: More verbose messages when sock diag infratructure is missing.

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent f52d53c5
...@@ -88,11 +88,14 @@ static int check_sock_diag(void) ...@@ -88,11 +88,14 @@ static int check_sock_diag(void)
{ {
int ret; int ret;
ret = collect_sockets(getpid()); ret = collect_sockets(0);
if (!ret) if (!ret)
return 0; return 0;
pr_msg("sock diag infrastructure is incomplete.\n"); pr_msg("The sock diag infrastructure is incomplete.\n");
pr_msg("Make sure you have:\n");
pr_msg(" 1. *_DIAG kernel config options turned on;\n");
pr_msg(" 2. *_diag.ko modules loaded (if compiled as modules).\n");
return -1; return -1;
} }
......
...@@ -530,7 +530,7 @@ out: ...@@ -530,7 +530,7 @@ out:
if (rst >= 0) { if (rst >= 0) {
if (restore_ns(rst, &net_ns_desc) < 0) if (restore_ns(rst, &net_ns_desc) < 0)
err = -1; err = -1;
} else { } else if (pid != 0) {
/* /*
* If netns isn't dumped, crtools will fail only * If netns isn't dumped, crtools will fail only
* if an unsupported socket will be really dumped. * if an unsupported socket will be really dumped.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment