[systemd-commits] 2 commits - src/libsystemd src/network

[Tom Gundersen]

 src/libsystemd/sd-rtnl/rtnl-internal.h |    2 +-
 src/network/networkd-link.c            |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 76800848f281c3705c9364fd3e888153d94aaf34
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Mar 8 01:08:30 2014 +0100

    networkd: link - degrade failed UP to warning
    
    Something else may still bring the link up, so don't enter failed state prematurely.

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 785e8d5..9fb8d9f 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1056,15 +1056,13 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_struct_link(LOG_ERR, link,
+        if (r < 0)
+                log_struct_link(LOG_WARNING, link,
                                 "MESSAGE=%s: could not bring up interface: %s",
                                 link->ifname, strerror(-r),
                                 "ERRNO=%d", -r,
                                 NULL);
-                link_enter_failed(link);
                 return 1;
-        }
 
         link_update_flags(link, link->flags | IFF_UP);
 

commit 59a7a684227cd8a8b4d84bd19acc1264d34fca65
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Mar 8 01:05:02 2014 +0100

    sd-rtnl: increase default timeout to match sd-bus

diff --git a/src/libsystemd/sd-rtnl/rtnl-internal.h b/src/libsystemd/sd-rtnl/rtnl-internal.h
index 0c17d94..f011dbe 100644
--- a/src/libsystemd/sd-rtnl/rtnl-internal.h
+++ b/src/libsystemd/sd-rtnl/rtnl-internal.h
@@ -29,7 +29,7 @@
 
 #include "sd-rtnl.h"
 
-#define RTNL_DEFAULT_TIMEOUT ((usec_t) (10 * USEC_PER_SEC))
+#define RTNL_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
 
 #define RTNL_WQUEUE_MAX 1024
 #define RTNL_RQUEUE_MAX 64*1024