summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-01-04 14:34:52 -0500
committerIan Stakenvicius <axs@gentoo.org>2013-01-04 14:34:52 -0500
commit8638965ac29853404154c3cd165e50056756c391 (patch)
treef150f2f6c673fa9ad8c9201c6bee3de72995791e
parent5ea3e4deffdfd7df3cf7466fe763848eb043d0bb (diff)
Fixed some comments relating to udevlibexecdir paths
Keymaps rules had stated to add or modify /usr/lib/udev/* files instead of using generic paths, and there was no mention of /etc/udev/* being valid even though it is (and is the better way to do system-specific modifications)
-rw-r--r--configure.ac2
-rw-r--r--rules/95-keyboard-force-release.rules8
-rw-r--r--rules/95-keymap.rules6
3 files changed, 13 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 2f62b8bfbc..87620bbd4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,8 @@ AC_SUBST([udevconfdir],[${sysconfdir}/udev])
AC_SUBST([udevconffile],[${udevconfdir}/udev.conf])
AC_SUBST([udevhwdbdir],[${udevconfdir}/hwdb.d])
AC_SUBST([udevhwdbbin],[${udevconfdir}/hwdb.bin])
+
+# udevlibexecdir paths
AC_SUBST([udevkeymapdir],[${udevlibexecdir}/keymaps])
AC_SUBST([udevkeymapforceredir],[${udevkeymapdir}/force-release])
AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d])
diff --git a/rules/95-keyboard-force-release.rules b/rules/95-keyboard-force-release.rules
index 39f01a4d3e..3e87ed791a 100644
--- a/rules/95-keyboard-force-release.rules
+++ b/rules/95-keyboard-force-release.rules
@@ -5,11 +5,15 @@
# The atkbd driver has a quirk handler for generating synthetic
# release events, which can be configured via sysfs since 2.6.32.
# Simply add a file with a list of scancodes for your laptop model
-# in /usr/lib/udev/keymaps, and add a rule here.
+# in ${rootlibdir}/udev/keymaps, and add a rule here.
# If the hotkeys also need a keymap assignment you can copy the
# scancodes from the keymap file, otherwise you can run
-# /usr/lib/udev/keymap -i /dev/input/eventX
+# ${rootlibdir}/udev/keymap -i /dev/input/eventX
# on a Linux vt to find out.
+#
+# Note also that system-specific keymaps and rules can be added
+# into the /etc/udev/rules.d/ and /etc/udev/keymaps/ directories
+# instead of modifying or adding to the system-installed files.
ACTION=="remove", GOTO="force_release_end"
SUBSYSTEM!="serio", GOTO="force_release_end"
diff --git a/rules/95-keymap.rules b/rules/95-keymap.rules
index 0ae8522657..1a208492ae 100644
--- a/rules/95-keymap.rules
+++ b/rules/95-keymap.rules
@@ -2,8 +2,12 @@
#
# Key map overrides can be specified by either giving scancode/keyname pairs
# directly as keymap arguments (if there are just one or two to change), or as
-# a file name (in /usr/lib/udev/keymaps), which has to contain scancode/keyname
+# a file name (in ${rootlibdir}/udev/keymaps), which has to contain scancode/keyname
# pairs.
+#
+# Note also that system-specific keymaps and rules can be added
+# into /etc/udev/keymaps/ instead of modifying or adding to the system-installed
+# files.
ACTION=="remove", GOTO="keyboard_end"
KERNEL!="event*", GOTO="keyboard_end"