[bcache-tools/f20] Fixed bug #1004693

[Rolf Fokkens]

commit ebd08aeb33d0f7eb35480e888a4f7b325d416817
Author: Rolf Fokkens <rolf.fokkens at target-holding.nl>
Date:   Fri Sep 6 15:07:46 2013 +0200

    Fixed bug #1004693

 bcache-tools-20130827-udevfix.patch |   33 +++++++++++++++++++++++++++++++++
 bcache-tools.spec                   |    9 ++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/bcache-tools-20130827-udevfix.patch b/bcache-tools-20130827-udevfix.patch
new file mode 100644
index 0000000..09a2c5b
--- /dev/null
+++ b/bcache-tools-20130827-udevfix.patch
@@ -0,0 +1,33 @@
+--- bcache-tools-20130827/61-bcache.rules.orig	2013-09-06 08:54:07.656978850 +0200
++++ bcache-tools-20130827/61-bcache.rules	2013-09-06 08:57:09.769768802 +0200
+@@ -5,13 +5,12 @@
+ ACTION=="remove", GOTO="bcache_end"
+ 
+ # Backing devices: scan, symlink, register
+-IMPORT{program}="/sbin/blkid -o udev $tempnode"
+ # blkid and probe-bcache can disagree, in which case don't register
+ ENV{ID_FS_TYPE}=="?*", ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
+ 
+ IMPORT{program}="/sbin/probe-bcache -o udev $tempnode"
+-ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+-SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="bcache", \
++ENV{BCACHE_ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{BCACHE_ID_FS_UUID_ENC}"
++SUBSYSTEM=="block", ACTION=="add|change", ENV{BCACHE_ID_FS_TYPE}=="bcache", \
+         RUN+="bcache-register $tempnode"
+ LABEL="bcache_backing_end"
+ 
+--- bcache-tools-20130827/probe-bcache.c.orig	2013-09-06 08:52:28.743089432 +0200
++++ bcache-tools-20130827/probe-bcache.c	2013-09-06 08:53:44.046005241 +0200
+@@ -61,9 +61,9 @@
+ 		uuid_unparse(sb.uuid, uuid);
+ 
+ 		if (udev)
+-			printf("ID_FS_UUID=%s\n"
+-			       "ID_FS_UUID_ENC=%s\n"
+-			       "ID_FS_TYPE=bcache\n",
++			printf("BCACHE_ID_FS_UUID=%s\n"
++			       "BCACHE_ID_FS_UUID_ENC=%s\n"
++			       "BCACHE_ID_FS_TYPE=bcache\n",
+ 			       uuid, uuid);
+ 		else
+ 			printf("%s: UUID=\"\" TYPE=\"bcache\"\n", uuid);
diff --git a/bcache-tools.spec b/bcache-tools.spec
index ce30f1d..429cca5 100644
--- a/bcache-tools.spec
+++ b/bcache-tools.spec
@@ -3,7 +3,7 @@
 Summary: Tools for Linux kernel block layer cache
 Name: bcache-tools
 Version: 0
-Release: 0.9.%{gitdate}git%{?dist}
+Release: 0.10.%{gitdate}git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://bcache.evilpiepirate.org/
@@ -31,6 +31,9 @@ Patch2: %{name}-20130827-register.patch
 # configure and make install are not "Fedora compliant", do a small step in the
 # right direction
 Patch3: %{name}-20130827-fedconfmake.patch
+# the udev interfacing is broken, but this fix is only temporary until
+# util-linux (blkid) takes care of bcache superblock identification
+Patch4: %{name}-20130827-udevfix.patch
 
 Requires: python
 BuildRequires: libuuid-devel systemd
@@ -51,6 +54,7 @@ tar xzf %{SOURCE1} --strip-components=1
 %patch2 -p1 -b .register
 %patch3 -p1 -b .fedconfmake
 chmod +x configure
+%patch4 -p1 -b .udevfix
 
 %build
 %configure
@@ -82,6 +86,9 @@ install -p  -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status
 %{_sbindir}/probe-bcache
 
 %changelog
+* Fri Sep 06 2013 Rolf Fokkens <rolf at rolffokkens.nl> - 0-0.10.20130827git
+- fixed some udev related issues (#1004693)
+
 * Mon Sep 02 2013 Rolf Fokkens <rolf at rolffokkens.nl> - 0-0.9.20130827git
 - fedconfmake.spec file renamed to fedconfmake.patch
 - removed libuuid as dependency