update NEWS TODO

diff --git a/NEWS b/NEWS
index 670b624756763aa8b454602119ee6258c28213f4..940bfa61488d4d28cce63ff0df3d6ccf55867039 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 udev 134
 ========
+Bugfixes.
+
+The group "video" is part of the default rules now.
 
 udev 133
 ========

diff --git a/TODO b/TODO
index c06451dd6094bf95a1bf00bc7e29b309d70dc79b..3fd49ac5da330386f94582684f251ee4fc1488a4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,8 @@
 
+  o switch device mapper rules to:
+     dmsetup info -c --nameprefixes --unquoted --rows --noheadings \
+       -o name,uuid,suspended,readonly,major,minor,open,tables_loaded
+  o implement path_id with libudev
   o convert firmware.sh to C
   o add DVB variables to kernel (patch merged in v4l tree), drop the
     shell script rule

diff --git a/configure.ac b/configure.ac
index 0ccd8d560ab29b87defb37b9d8ff8bb52cbbd37f..cbd760edbf6cbd4a2f7c8a6e641dceef94496bbf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PROG_LIBTOOL
 
 dnl /* libudev version */
 LIBUDEV_LT_CURRENT=0
-LIBUDEV_LT_REVISION=5
+LIBUDEV_LT_REVISION=6
 LIBUDEV_LT_AGE=0
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index a93ade6427363176b68010cc9f18f57021380cf5..8bbbc38c3200c975de29290d24c019e4c0b86b59 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -446,7 +446,7 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
                                info("signature '%s' %i detected\n", id->type, i);
                                if (id->force_unique_result)
                                        force_unique_result = 1;
-                               if (found && force_unique_result) {
+                               if (found > 0 && force_unique_result) {
                                        info("conflicting signatures found, skip results\n");
                                        return -1;
                                }