diff --git a/modprobe.mptctl b/modprobe.mptctl deleted file mode 100644 index 923ef38..0000000 --- a/modprobe.mptctl +++ /dev/null @@ -1,3 +0,0 @@ -# Autoload mptctl -install mptbase /sbin/modprobe --ignore-install mptbase && /sbin/modprobe --ignore-install mptctl -remove mptbase /sbin/modprobe -r --ignore-remove mptctl; /sbin/modprobe -r --ignore-remove mptbase diff --git a/mpt-firmware.changes b/mpt-firmware.changes index f949d29..78fe4f1 100644 --- a/mpt-firmware.changes +++ b/mpt-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 3 15:04:10 CET 2008 - hare@suse.de + +- Move to use udev rules to avoid mkinitrd breakage + (bnc#449123) + ------------------------------------------------------------------- Thu Nov 20 11:00:16 CET 2008 - hare@suse.de diff --git a/mpt-firmware.spec b/mpt-firmware.spec index 8852419..66beaf3 100644 --- a/mpt-firmware.spec +++ b/mpt-firmware.spec @@ -21,13 +21,13 @@ Name: mpt-firmware Summary: Configuration files for autoloading mptctl at boot time Version: 1.0 -Release: 234 +Release: 235 License: GPL v2 or later Group: Hardware/Other Requires: module-init-tools BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: modprobe.mptctl +Source0: mptctl.rules Source3: update-pci-id-list.sh # Module: mptspi.ko Supplements: modalias(pci:v00001000d00000030sv*sd*bc*sc*i*) @@ -57,8 +57,8 @@ Supplements: modalias(pci:v00001000d00000062sv*sd*bc*sc*i*) # There is nothing to build %install -mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d -cp %{S:0} $RPM_BUILD_ROOT/etc/modprobe.d/mptctl +mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d +cp %{S:0} $RPM_BUILD_ROOT/etc/udev/rules.d/81-mptctl.rules %description This package contains modprobe configuration files to autoload the @@ -83,10 +83,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir /etc/modprobe.d -%config /etc/modprobe.d/* +%dir /etc/udev/rules.d +%config /etc/udev/rules.d/* %changelog +* Wed Dec 03 2008 hare@suse.de +- Move to use udev rules to avoid mkinitrd breakage + (bnc#449123) * Thu Nov 20 2008 hare@suse.de - Update to use modprobe files (bnc#444815) - Update modalias definitions. diff --git a/mptctl.rules b/mptctl.rules new file mode 100644 index 0000000..826c46a --- /dev/null +++ b/mptctl.rules @@ -0,0 +1,6 @@ +# Autoload mptctl module +ACTION!="add", GOTO="mptctl_end" + +SUBSYSTEM=="pci", DRIVER=="mpt*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe mptctl" + +LABEL="mptctl_end"