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

[Tom Gundersen]

 src/network/networkctl.c      |    4 ++--
 src/network/networkd-netdev.c |    2 +-
 src/udev/udevd.c              |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 144232a8e0ea77eed8c5a456832758681b5b3511
Author: Torstein Husebø <torstein at huseboe.net>
Date:   Wed Dec 3 20:59:00 2014 +0100

    networkd: fix typo
    
    V2: found another one

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 6225330..a763630 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -333,7 +333,7 @@ static int get_gateway_description(sd_rtnl *rtnl, struct udev_hwdb *hwdb, int if
 
                 r = sd_rtnl_message_neigh_get_ifindex(m, &ifi);
                 if (r < 0) {
-                        log_error_errno(r, "colud not get ifindex: %m");
+                        log_error_errno(r, "could not get ifindex: %m");
                         continue;
                 }
 
@@ -427,7 +427,7 @@ static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *pref
 
                 r = sd_rtnl_message_read_u32(m, RTA_OIF, &ifi);
                 if (r < 0) {
-                        log_error_errno(r, "colud not get RTA_OIF: %m");
+                        log_error_errno(r, "could not get RTA_OIF: %m");
                         continue;
                 }
 
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index a08236e..b75eab9 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -503,7 +503,7 @@ static int netdev_create(NetDev *netdev, Link *link,
                         r = sd_rtnl_message_append_u32(m, IFLA_LINK, link->ifindex);
                         if (r < 0) {
                                 log_netdev_error(netdev,
-                                                 "Colud not append IFLA_LINK attribute: %s",
+                                                 "Could not append IFLA_LINK attribute: %s",
                                                  strerror(-r));
                                 return r;
                         }

commit 523c620bcd657f22cb52e6b78881cbb1f7d6832a
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Dec 3 20:00:28 2014 +0100

    udevd: don't take reference for NULL rtnl object

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index ab2b4ba..6a8dda3 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -315,8 +315,9 @@ static void worker_new(struct event *event) {
                                                arg_event_timeout_usec, arg_event_timeout_warn_usec,
                                                &sigmask_orig);
 
-                        /* in case rtnl was initialized */
-                        rtnl = sd_rtnl_ref(udev_event->rtnl);
+                        if (udev_event->rtnl)
+                                /* in case rtnl was initialized */
+                                rtnl = sd_rtnl_ref(udev_event->rtnl);
 
                         /* apply/restore inotify watch */
                         if (udev_event->inotify_watch) {