From f699a408e9d37e0faf38167d6b205c1300b4b1f7 Mon Sep 17 00:00:00 2001
From: aledvink <aledvink@localhost.localdomain>
Date: Tue, 14 Jan 2014 10:55:53 +0100
Subject: [PATCH] Module probing right after the installation. Do not wait
 until reboot kmod/udev.

---
 OpenIPMI.spec | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index 819877f..af0f691 100644
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -4,8 +4,10 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
+%global once %{_localstatedir}/run/%{name}/first_installation
+
 Version: 2.0.19
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+ and GPLv2+ or BSD
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -42,6 +44,8 @@ This package contains the tools of the OpenIPMI project.
 %package modalias
 Group: System Environment/Kernel
 Summary: Module aliases for IPMI subsystem
+Requires: systemd
+Requires: kmod
 
 %description modalias
 The OpenIPMI-modalias provides configuration file with module aliases
@@ -126,6 +130,7 @@ install -d ${RPM_BUILD_ROOT}%{_unitdir}
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d
 install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/OpenIPMI.conf
+install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}
 
 rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1
 
@@ -138,6 +143,22 @@ if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{
     %{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz
 fi
 
+%posttrans modalias
+if [ -f "%{once}" ]; then
+    if /usr/bin/udevadm info --export-db | grep -qie 'acpi:IPI0'; then
+        /sbin/modprobe ipmi_si || :;
+        /sbin/modprobe ipmi_devintf || :;
+        /sbin/modprobe ipmi_msghandler || :;
+        %{__rm} -f %{once} || :;
+        /usr/bin/udevadm settle
+    fi
+fi
+
+%post modalias
+if [ "$1" -eq 1 ]; then
+    /bin/touch %{once}
+fi
+
 %post
 %systemd_post ipmi.service
 
@@ -205,8 +226,15 @@ fi
 
 %files modalias
 %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf
+%{_localstatedir}/run/%{name}
 
 %changelog
+* Tue Jan 14 2014 Ledvinka Ales <aledvink@redhat.com> - 2.0.19-11
+- Probe modules on installation. Do not wait until reboot.
+
+* Wed Nov 13 2013 Ledvinka Ales <aledvink@redhat.com> - 2.0.19-10
+- Correct aliases matching module strings.
+
 * Tue Nov 05 2013 Fedora Release Engineering <aledvink@redhat.com> - 2.0.19-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild