|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
From d1df055e24f9daaeda39ee8a57429849c78f71d4 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
From: Tom Gundersen <teg@jklm.no>
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
Date: Sat, 8 Mar 2014 01:08:30 +0100
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
Subject: [PATCH] networkd: link - degrade failed UP to warning
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
Something else may still bring the link up, so don't enter failed state prematurely.
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
(cherry picked from commit 76800848f281c3705c9364fd3e888153d94aaf34)
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
---
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
src/network/networkd-link.c | 6 ++----
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
index 1f495b3..5831d83 100644
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
--- a/src/network/networkd-link.c
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
+++ b/src/network/networkd-link.c
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
@@ -790,15 +790,13 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
return 1;
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
r = sd_rtnl_message_get_errno(m);
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
- if (r < 0) {
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
- log_struct_link(LOG_ERR, link,
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
+ if (r < 0)
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
+ log_struct_link(LOG_WARNING, link,
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
"MESSAGE=%s: could not bring up interface: %s",
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
link->ifname, strerror(-r),
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
"ERRNO=%d", -r,
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
NULL);
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
- link_enter_failed(link);
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
return 1;
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
- }
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
link_update_flags(link, link->flags | IFF_UP);
|
|
Zbigniew Jędrzejewski-Szmek |
dd42fc |
|