[systemd/f19] systemd-204-11

[Harald Hoyer]

commit f07f76f46a9524931328dfd7c0edf394c1aa7737
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Sep 5 14:12:03 2013 +0200

    systemd-204-11
    
    - always call kmod, even when a driver is bound to the device
    Resolves: rhbz#1004456

 bf7f800f2b3e93ccd1229d4717166f3a4d3af72f.patch |   37 ++++++++++++++++++++++++
 systemd.spec                                   |   10 +++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/bf7f800f2b3e93ccd1229d4717166f3a4d3af72f.patch b/bf7f800f2b3e93ccd1229d4717166f3a4d3af72f.patch
new file mode 100644
index 0000000..4c2d272
--- /dev/null
+++ b/bf7f800f2b3e93ccd1229d4717166f3a4d3af72f.patch
@@ -0,0 +1,37 @@
+From bf7f800f2b3e93ccd1229d4717166f3a4d3af72f Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay at vrfy.org>
+Date: Sat, 20 Jul 2013 12:29:12 +0000
+Subject: rules: drivers - always call kmod, even when a driver is bound to the device
+
+On Sat, Jul 20, 2013 at 12:56 PM, Rafael J. Wysocki <rjw at sisk.pl> wrote:
+> After a recent change present in 3.11-rc1 there is a driver, called processor,
+> that can be bound to the CPU devices whose sysfs directories are located under
+> /sys/devices/system/cpu/.  A side effect of this is that, after the driver has
+> been bound to those devices, the kernel adds DRIVER=processor to ENV for CPU
+> uevents and they don't match the default rule for autoloading modules matching
+> MODALIAS:
+>
+> DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}"
+>
+> any more.  However, there are some modules whose module aliases match specific
+> CPU features through the modalias string and those modules should be loaded
+> automatically if a compatible CPU is present.  Yet, with the processor driver
+> bound to the CPU devices the above rule is not sufficient for that, so we need
+> a new default udev rule allowing those modules to be autoloaded even if the
+> CPU devices have drivers.
+---
+diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
+index 50523e4..0b22d73 100644
+--- a/rules/80-drivers.rules
++++ b/rules/80-drivers.rules
+@@ -2,7 +2,7 @@
+ 
+ ACTION=="remove", GOTO="drivers_end"
+ 
+-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
++ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
+ SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}="kmod load tifm_sd"
+ SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}="kmod load tifm_ms"
+ SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/systemd.spec b/systemd.spec
index 3c4fc43..4ac9866 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -22,7 +22,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        204
-Release:        10%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        11%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -46,6 +46,7 @@ Source6:        yum-protect-systemd.conf
 
 Patch1:         0001-journal-letting-interleaved-seqnums-go.patch
 Patch2:         0002-journal-remember-last-direction-of-search-and-keep-o.patch
+Patch3:         bf7f800f2b3e93ccd1229d4717166f3a4d3af72f.patch
 # kernel-install patch for grubby, drop if grubby is obsolete
 Patch1000:      kernel-install-grubby.patch
 
@@ -805,7 +806,12 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
-* Sun Aug 16 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 204-11
+* Thu Sep 05 2013 Harald Hoyer <harald at redhat.com> 204-11
+- bump release
+- always call kmod, even when a driver is bound to the device
+Resolves: rhbz#1004456
+
+* Fri Aug 16 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 204-11
 - Filter out provides for private python modules.
 
 * Sun Aug 11 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 204-10