Accepting request 159735 from home:elvigia:branches:Base:System

- The "allow_unsupported_modules" feature, does not belong too
  openSUSE, kmod (and hence udev and systemd) do not understand
  it in anyway. limit to SLE only.

OBS-URL: https://build.opensuse.org/request/show/159735
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=3
This commit is contained in:
Andreas Jaeger 2013-03-26 08:41:35 +00:00 committed by Git OBS Bridge
parent a6bef44923
commit e8506629b1
2 changed files with 15 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Mar 17 20:04:12 UTC 2013 - crrodriguez@opensuse.org
- The "allow_unsupported_modules" feature, does not belong too
openSUSE, kmod (and hence udev and systemd) do not understand
it in anyway. limit to SLE only.
-------------------------------------------------------------------
Wed Nov 14 18:31:35 UTC 2012 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package suse-module-tools
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -37,7 +37,7 @@ Source5: weak-modules
Source6: weak-modules2
Source7: driver-check.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildArch: noarch
%description
This package contains helper scripts for KMP installation and
@ -63,8 +63,10 @@ if [ -f "modprobe.conf.$RPM_ARCH" ]; then
cat "modprobe.conf.$RPM_ARCH" >>00-system.conf
fi
install -d -m 755 "$b/etc/modprobe.d"
%if 0%{?sles_version}
install -pm644 "%_sourcedir/10-unsupported-modules.conf" \
"$b/etc/modprobe.d/"
%endif
install -pm644 00-system.conf "$b/etc/modprobe.d/"
install -pm644 modprobe.conf.local "$b/etc/modprobe.d/99-local.conf"
install -d -m 755 "$b/etc/depmod.d"
@ -77,6 +79,7 @@ install -pm 755 %_sourcedir/weak-modules{,2} "$b/usr/lib/module-init-tools/"
install -pm 755 %_sourcedir/driver-check.sh "$b/usr/lib/module-init-tools/"
%post
%if 0%{?sles_version}
test_allow_on_install()
{
# configure handling of unsupported modules
@ -129,12 +132,14 @@ if test "$allow" = "0"; then
sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \
/etc/modprobe.d/10-unsupported-modules.conf
fi
%endif
%files
%defattr(-,root,root)
%dir /etc/modprobe.d
%config /etc/modprobe.d/00-system.conf
%if 0%{?sles_version}
%config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf
%endif
%config(noreplace) /etc/modprobe.d/99-local.conf
%dir /etc/depmod.d
%config /etc/depmod.d/00-system.conf