aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-07-18 16:43:45 +1000
committerSaul Wold <sgw@linux.intel.com>2013-07-22 09:44:10 -0700
commitc7ca6dec31de4321313e56753d056c9df115bd96 (patch)
tree192b1d9d68ca9e416bed1175a2d58e9c5ec07f1c /meta/recipes-core/systemd
parent10cdd66fe800cffe3f2cbf5c95550b4f7902a311 (diff)
downloadopenembedded-core-c7ca6dec31de4321313e56753d056c9df115bd96.tar.gz
systemd: remove unneeded modprobe.rules
systemd already handles loading kernel modules for new hardware. This also allows blacklisting modules to work properly when creating a .conf file in /etc/modprobe.d containing "blacklist module_name". Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/modprobe.rules17
-rw-r--r--meta/recipes-core/systemd/systemd_204.bb1
2 files changed, 0 insertions, 18 deletions
diff --git a/meta/recipes-core/systemd/systemd/modprobe.rules b/meta/recipes-core/systemd/systemd/modprobe.rules
deleted file mode 100644
index d4a096b82b..0000000000
--- a/meta/recipes-core/systemd/systemd/modprobe.rules
+++ /dev/null
@@ -1,17 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-# For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Try and modprobe for drivers for new hardware
-ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb
index b8b1290940..62613673a9 100644
--- a/meta/recipes-core/systemd/systemd_204.bb
+++ b/meta/recipes-core/systemd/systemd_204.bb
@@ -19,7 +19,6 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
file://touchscreen.rules \
- file://modprobe.rules \
${UCLIBCPATCHES} \
file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \
file://install-quotaon-once.patch \