summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Krause <bst@pengutronix.de>2021-11-26 10:58:00 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-11-26 19:21:29 +0100
commite85e463bb4164a5a68bb4ad06dfdb5d713a86448 (patch)
tree0e8d3ff45fc90f96011c4811d625a7c2e0a753b9
parent36984a531b3495bc8dc92d01ec3c99b79073d9c9 (diff)
downloadptxdist-e85e463bb4164a5a68bb4ad06dfdb5d713a86448.tar.gz
ptxdist-e85e463bb4164a5a68bb4ad06dfdb5d713a86448.tar.xz
systemd: always install udev rule for kernel module loading
It is generally intended that kernel modules are loaded via udev. So drop the corresponding option and install the udev rule unconditionally. Signed-off-by: Bastian Krause <bst@pengutronix.de> Message-Id: <20211126095800.2374644-1-bst@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/systemd.in11
-rw-r--r--rules/systemd.make2
2 files changed, 1 insertions, 12 deletions
diff --git a/rules/systemd.in b/rules/systemd.in
index 74169cd5a..1a8696d2b 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -176,17 +176,6 @@ menu "udev "
menu "install options "
-config SYSTEMD_UDEV_DRIVERS_RULES
- bool
- default y
- prompt "install udev driver rules"
- help
- This will install the generic udev drivers rules files from the udev package
- under '/usr/lib/udev/rules.d/',
- These rules are required to automatically load kernel modules on
- udev start.
- If unsure say Y.
-
config SYSTEMD_UDEV_HWDB
bool
select SYSTEMD_HWDB
diff --git a/rules/systemd.make b/rules/systemd.make
index 2d96de70b..41bd5a8a8 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -299,6 +299,7 @@ SYSTEMD_UDEV_RULES-y := \
64-btrfs.rules \
75-net-description.rules \
78-sound-card.rules \
+ 80-drivers.rules \
80-net-setup-link.rules \
99-systemd.rules
@@ -323,7 +324,6 @@ SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_FIDO) += 60-fido-id.rules
SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_V4L) += 60-persistent-v4l.rules
SYSTEMD_UDEV_RULES-$(PTXCONF_ARCH_X86) += 70-memory.rules
SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_MTD_PROBE) += 75-probe_mtd.rules
-SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_DRIVERS_RULES) += 80-drivers.rules
$(STATEDIR)/systemd.targetinstall:
@$(call targetinfo)