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

[Kay Sievers]

 src/libudev/libudev-hwdb.c |    2 +-
 src/udev/udevd.c           |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit cabaa37a602ea787d3b3d1f6ec402de7918a4823
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Aug 15 19:54:03 2013 +0200

    libudev: fix hwdb validation to look for the *new* file

diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index 5645a11..de1cb83 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -358,7 +358,7 @@ bool udev_hwdb_validate(struct udev_hwdb *hwdb) {
                 return false;
         if (!hwdb->f)
                 return false;
-        if (fstat(fileno(hwdb->f), &st) < 0)
+        if (stat("/etc/udev/hwdb.bin", &st) < 0)
                 return true;
         if (timespec_load(&hwdb->st.st_mtim) != timespec_load(&st.st_mtim))
                 return true;

commit 47e737dc13bf4251ae5a2249ec29b34503ed92e1
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Aug 15 19:51:08 2013 +0200

    udevd: simplify sigterm check

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 7c6c5d6..fd799cc 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -314,13 +314,11 @@ static void worker_new(struct event *event)
                         udev_device_unref(dev);
                         dev = NULL;
 
-                        if (udev_event->sigterm) {
-                                udev_event_unref(udev_event);
-                                goto out;
-                        }
-
                         udev_event_unref(udev_event);
 
+                        if (udev_event->sigterm)
+                                goto out;
+
                         /* wait for more device messages from main udevd, or term signal */
                         while (dev == NULL) {
                                 struct epoll_event ev[4];