From e70d6743a17df2dab81f77b8def5dc9e3f985088 Mon Sep 17 00:00:00 2001
From: Rolf Fokkens <rolf.fokkens@target-holding.nl>
Date: Sep 30 2013 19:58:28 +0000
Subject: fix potential udev rules issue


---

diff --git a/bcache-tools-20130909-udevfix-old.patch b/bcache-tools-20130909-udevfix-old.patch
index 07c8d12..84bd836 100644
--- a/bcache-tools-20130909-udevfix-old.patch
+++ b/bcache-tools-20130909-udevfix-old.patch
@@ -1,8 +1,12 @@
---- bcache-tools-20130909/61-bcache.rules.udevfix	2013-09-11 21:39:09.690473058 +0200
-+++ bcache-tools-20130909/61-bcache.rules	2013-09-11 21:38:49.273376220 +0200
-@@ -5,13 +5,12 @@
+--- bcache-tools-20130909/61-bcache.rules.udevfix-old	2013-09-01 12:38:11.000000000 +0200
++++ bcache-tools-20130909/61-bcache.rules	2013-09-30 19:09:34.457450713 +0200
+@@ -4,14 +4,16 @@
+ SUBSYSTEM!="block", GOTO="bcache_end"
  ACTION=="remove", GOTO="bcache_end"
  
++# There's no certainty that blkid was executed by any of the earlier rules
++# so to be sure it's executed here too
++IMPORT{builtin}="blkid"
  # Backing devices: scan, symlink, register
 -IMPORT{program}="/sbin/blkid -o udev $tempnode"
  # blkid and probe-bcache can disagree, in which case don't register
@@ -16,3 +20,18 @@
          RUN+="bcache-register $tempnode"
  LABEL="bcache_backing_end"
  
+--- bcache-tools-20130909/probe-bcache.c.udevfix-old	2013-09-30 19:23:00.663897443 +0200
++++ bcache-tools-20130909/probe-bcache.c	2013-09-30 19:24:13.260847312 +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-20130909-udevfix.patch b/bcache-tools-20130909-udevfix.patch
index d7574f2..b22a5e2 100644
--- a/bcache-tools-20130909-udevfix.patch
+++ b/bcache-tools-20130909-udevfix.patch
@@ -1,6 +1,6 @@
---- bcache-tools-20130909/61-bcache.rules.udevfix	2013-09-11 21:39:18.129513289 +0200
-+++ bcache-tools-20130909/61-bcache.rules	2013-09-11 21:52:32.233291340 +0200
-@@ -4,12 +4,8 @@
+--- bcache-tools-20130909/61-bcache.rules.udevfix	2013-09-01 12:38:11.000000000 +0200
++++ bcache-tools-20130909/61-bcache.rules	2013-09-30 18:58:14.914729951 +0200
+@@ -4,12 +4,11 @@
  SUBSYSTEM!="block", GOTO="bcache_end"
  ACTION=="remove", GOTO="bcache_end"
  
@@ -10,6 +10,9 @@
 -ENV{ID_FS_TYPE}=="?*", ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
 -
 -IMPORT{program}="/sbin/probe-bcache -o udev $tempnode"
++# There's no certainty that blkid was executed by any of the earlier rules
++# so to be sure it's executed here too
++IMPORT{builtin}="blkid"
 +# Backing devices: symlink, register
 +ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
  ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
diff --git a/bcache-tools.spec b/bcache-tools.spec
index df8f3fd..431e957 100644
--- a/bcache-tools.spec
+++ b/bcache-tools.spec
@@ -15,7 +15,7 @@
 Summary: Tools for Linux kernel block layer cache
 Name: bcache-tools
 Version: 0
-Release: 0.12.%{gitdate}git%{?dist}
+Release: 0.13.%{gitdate}git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://bcache.evilpiepirate.org/
@@ -116,8 +116,11 @@ install -p  -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status
 %endif
 
 %changelog
+* Mon Sep 30 2013 Rolf Fokkens <rolf@rolffokkens.nl> - 0-0.13.20130909git
+- (#1004693) add execute blkid in 61-bcache.rules
+
 * Fri Sep 27 2013 Rolf Fokkens <rolf@rolffokkens.nl> - 0-0.12.20130909git
-- obsolete probe-bcache in F20 using use_blkid macro
+- remove obsoleted probe-bcache in F20 using use_blkid macro
 
 * Mon Sep 09 2013 Rolf Fokkens <rolf@rolffokkens.nl> - 0-0.11.20130909git
 - updated to new bcache-status