libudev: do not set DEVNAME= twice

When we read the 'uevent' file we need to make sure, that we do not
read the relative DEVNAME= path provided by the kernel and overwrite
the absolute path udev expects here.

diff --git a/Makefile.am b/Makefile.am
index 3271bdb54c5bbaebdb4b6fe7dab47f509207a32d..e2926005657bdd462e321f5e1e746896d8a1b4a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,7 @@ SED_PROCESS = \
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=13
 
 SUBDIRS += src/docs

diff --git a/NEWS b/NEWS
index 0973d80668ccde5085a9ad2223b6faf9b28c971d..a0ed539454f32680c1e6f3494e55bc4c45866c6c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+udev 178
+========
+Bugfix for the firmware loading behavior with kernel modules which
+try to load firmware in the module_init() path. The blocked event
+runs into a timout now, which should allow the firmware to be loaded.
+
+Bugfix for a wrong DEVNAME= export, which breaks at least the udev-acl
+tool.
+
+Bugfix for missing ID_ properties for GPT partitions.
+
+The RUN+="socket:.." option is deprecated and should not be used. A warning
+during rules parsing is printed now. Services which listen to udev events,
+need to subscribe to the netlink messages with libudev and not let udev block
+in the rules execution until the message is delivered.
+
 udev 177
 ========
 Bugfix for rule_generator instalation.

diff --git a/src/libudev-device.c b/src/libudev-device.c
index a3356cfd18bba8b09f5c22624480925404aa67ab..10f28b8cd5bb5a4a4fb40067d2f4cfdd3b1155d3 100644 (file)
--- a/src/libudev-device.c
+++ b/src/libudev-device.c
@@ -548,16 +548,23 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
                         continue;
                 pos[0] = '\0';
 
-                if (strncmp(line, "DEVTYPE=", 8) == 0)
+                if (strncmp(line, "DEVTYPE=", 8) == 0) {
                         udev_device_set_devtype(udev_device, &line[8]);
-                else if (strncmp(line, "MAJOR=", 6) == 0)
+                        continue;
+                }
+                if (strncmp(line, "IFINDEX=", 8) == 0) {
+                        udev_device_set_ifindex(udev_device, strtoull(&line[8], NULL, 10));
+                        continue;
+                }
+                if (strncmp(line, "DEVNAME=", 8) == 0) {
+                        udev_device_set_devnode(udev_device, &line[8]);
+                        continue;
+                }
+
+                if (strncmp(line, "MAJOR=", 6) == 0)
                         maj = strtoull(&line[6], NULL, 10);
                 else if (strncmp(line, "MINOR=", 6) == 0)
                         min = strtoull(&line[6], NULL, 10);
-                else if (strncmp(line, "IFINDEX=", 8) == 0)
-                        udev_device_set_ifindex(udev_device, strtoull(&line[8], NULL, 10));
-                else if (strncmp(line, "DEVNAME=", 8) == 0)
-                        udev_device_set_devnode(udev_device, &line[8]);
                 else if (strncmp(line, "DEVMODE=", 8) == 0)
                         udev_device->devnode_mode = strtoul(&line[8], NULL, 8);