From 248bb31045b9cbe02680f42612a478b32c7c46b7 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 18 Jul 2013 16:43:45 +1000 Subject: 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". (From OE-Core rev: c7ca6dec31de4321313e56753d056c9df115bd96) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd/modprobe.rules | 17 ----------------- meta/recipes-core/systemd/systemd_204.bb | 1 - 2 files changed, 18 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/modprobe.rules (limited to 'meta/recipes-core/systemd') 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 \ -- cgit v1.2.3-54-g00ecf