Commit 8201e080 authored by Pavel Emelyanov's avatar Pavel Emelyanov

check: Warn *diag absense always

To know what exactly is missing.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent a3872dbe
...@@ -501,7 +501,7 @@ int cr_check(void) ...@@ -501,7 +501,7 @@ int cr_check(void)
{ {
int ret = 0; int ret = 0;
log_set_loglevel(LOG_ERROR); log_set_loglevel(LOG_WARN);
if (mntns_collect_root(getpid())) { if (mntns_collect_root(getpid())) {
pr_err("Can't collect root mount point\n"); pr_err("Can't collect root mount point\n");
......
...@@ -607,9 +607,8 @@ int collect_sockets(int pid) ...@@ -607,9 +607,8 @@ int collect_sockets(int pid)
PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG; PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG;
tmp = do_collect_req(nl, &req, sizeof(req), packet_receive_one, NULL); tmp = do_collect_req(nl, &req, sizeof(req), packet_receive_one, NULL);
if (tmp) { if (tmp) {
if (pid != 0 && tmp == -ENOENT) /* Fedora 19 */ pr_warn("The current kernel doesn't support packet_diag\n");
pr_warn("The current kernel doesn't support packet_diag\n"); if (pid == 0 || tmp != -ENOENT) /* Fedora 19 */
else
err = tmp; err = tmp;
} }
...@@ -618,9 +617,8 @@ int collect_sockets(int pid) ...@@ -618,9 +617,8 @@ int collect_sockets(int pid)
req.r.n.ndiag_show = NDIAG_SHOW_GROUPS; req.r.n.ndiag_show = NDIAG_SHOW_GROUPS;
tmp = do_collect_req(nl, &req, sizeof(req), netlink_receive_one, NULL); tmp = do_collect_req(nl, &req, sizeof(req), netlink_receive_one, NULL);
if (tmp) { if (tmp) {
if (pid != 0 && tmp == -ENOENT) /* Going to be in 3.10 */ pr_warn("The current kernel doesn't support netlink_diag\n");
pr_warn("The current kernel doesn't support netlink_diag\n"); if (pid == 0 || tmp != -ENOENT) /* Going to be in 3.10 */
else
err = tmp; err = tmp;
} }
......
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