summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-03-18 15:12:18 +0100
committerKay Sievers <kay@vrfy.org>2013-03-18 15:19:51 +0100
commita3bd8447be4ea2ce230eb8ae0e815c04d85fa15a (patch)
treeb414aae2a92fe31fc9cc78fab28814c688a64e9f /rules
parent72c6cf8fa586a08b56a1b5d7ed6d7c7272dff3f4 (diff)
downloadsystemd-a3bd8447be4ea2ce230eb8ae0e815c04d85fa15a.tar.gz
systemd-a3bd8447be4ea2ce230eb8ae0e815c04d85fa15a.tar.bz2
systemd-a3bd8447be4ea2ce230eb8ae0e815c04d85fa15a.zip
udev: make firmware loading optional and disable by default
Distros that whish to support old kernels should set --with-firmware-dirs="/usr/lib/firmware/updates:/usr/lib/firmware" to retain the old behaviour.
Diffstat (limited to 'rules')
-rw-r--r--rules/50-firmware.rules3
-rw-r--r--rules/50-udev-default.rules1
2 files changed, 3 insertions, 1 deletions
diff --git a/rules/50-firmware.rules b/rules/50-firmware.rules
new file mode 100644
index 0000000000..f0ae684518
--- /dev/null
+++ b/rules/50-firmware.rules
@@ -0,0 +1,3 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 5d8bde53c1..9d17cf71ab 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -64,5 +64,4 @@ SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
-SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"