diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/keymap/.gitignore | 2 | ||||
| -rw-r--r-- | extras/keymap/95-keyboard-force-release.rules | 4 | ||||
| -rw-r--r-- | extras/keymap/95-keymap.rules | 2 | ||||
| -rw-r--r-- | extras/keymap/README.keymap.txt | 12 | ||||
| -rw-r--r-- | extras/keymap/keyboard-force-release.sh.in (renamed from extras/keymap/keyboard-force-release.sh) | 2 | ||||
| -rw-r--r-- | extras/mtd_probe/.gitignore | 1 | ||||
| -rw-r--r-- | extras/mtd_probe/75-probe_mtd.rules.in (renamed from extras/mtd_probe/75-probe_mtd.rules) | 2 | ||||
| -rw-r--r-- | extras/rule_generator/rule_generator.functions | 5 | ||||
| -rw-r--r-- | extras/scsi_id/.gitignore | 1 | ||||
| -rw-r--r-- | extras/scsi_id/scsi_id.8 | 4 |
10 files changed, 17 insertions, 18 deletions
diff --git a/extras/keymap/.gitignore b/extras/keymap/.gitignore index f2c4c8dca6..01d62e2b6e 100644 --- a/extras/keymap/.gitignore +++ b/extras/keymap/.gitignore @@ -1,6 +1,6 @@ +keyboard-force-release.sh keymap keys-from-name.gperf keys-from-name.h keys-to-name.h keys.txt - diff --git a/extras/keymap/95-keyboard-force-release.rules b/extras/keymap/95-keyboard-force-release.rules index 63cf67fb59..79a1bc1cc4 100644 --- a/extras/keymap/95-keyboard-force-release.rules +++ b/extras/keymap/95-keyboard-force-release.rules @@ -5,10 +5,10 @@ # 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 /lib/udev/keymaps, and add a rule here. +# in /usr/lib/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 -# /lib/udev/keymap -i /dev/input/eventX +# /usr/lib/udev/keymap -i /dev/input/eventX # on a Linux vt to find out. ACTION=="remove", GOTO="force_release_end" diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules index 248c58f09c..1ec18b7f55 100644 --- a/extras/keymap/95-keymap.rules +++ b/extras/keymap/95-keymap.rules @@ -2,7 +2,7 @@ # # 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 /lib/udev/keymaps), which has to contain scancode/keyname +# a file name (in /usr/lib/udev/keymaps), which has to contain scancode/keyname # pairs. ACTION=="remove", GOTO="keyboard_end" diff --git a/extras/keymap/README.keymap.txt b/extras/keymap/README.keymap.txt index 79d9971b1d..acdc00283a 100644 --- a/extras/keymap/README.keymap.txt +++ b/extras/keymap/README.keymap.txt @@ -44,7 +44,7 @@ for inclusion you need to do the following steps: 1. Find the keyboard device. - Run /lib/udev/findkeyboards. This should always give you an "AT + Run /usr/lib/udev/findkeyboards. This should always give you an "AT keyboard" and possibly a "module". Some laptops (notably Thinkpads, Sonys, and Acers) have multimedia/function keys on a separate input device instead of the primary keyboard. The keyboard device should have a name like "input/event3". @@ -53,7 +53,7 @@ for inclusion you need to do the following steps: 2. Find broken scan codes: - sudo /lib/udev/keymap -i input/eventX + sudo /usr/lib/udev/keymap -i input/eventX Press all multimedia/function keys and check if the key name that gets printed out is plausible. If it is unknown or wrong, write down the scan code (looks @@ -67,14 +67,14 @@ for inclusion you need to do the following steps: 0x1E www # Fn+F2 web browser Repeat that for all other keys. Write the resulting list into a file. Look at - /lib/udev/keymaps/ for existing key map files and make sure that you use the + /usr/lib/udev/keymaps/ for existing key map files and make sure that you use the same structure. If the key only ever works once and then your keyboard (or the entire desktop) gets stuck for a long time, then it is likely that the BIOS fails to send a corresponding "key release" event after the key press event. Please note down this case as well, as it can be worked around in - /lib/udev/keymaps/95-keyboard-force-release.rules . + /usr/lib/udev/keymaps/95-keyboard-force-release.rules . 3. Find out your system vendor and product: @@ -87,8 +87,8 @@ for inclusion you need to do the following steps: and /tmp/udev-db.txt from step 4 to the linux-hotplug@vger.kernel.org mailing list, so that they can be included in the next release. -For local testing, copy your map file to /lib/udev/keymaps/ with an appropriate -name, and add an appropriate udev rule to /lib/udev/rules.d/95-keymap.rules: +For local testing, copy your map file to /usr/lib/udev/keymaps/ with an appropriate +name, and add an appropriate udev rule to /usr/lib/udev/rules.d/95-keymap.rules: * If you selected an "AT keyboard", add the rule to the section after 'LABEL="keyboard_vendorcheck"'. diff --git a/extras/keymap/keyboard-force-release.sh b/extras/keymap/keyboard-force-release.sh.in index b157ac310d..05dd5da2e0 100644 --- a/extras/keymap/keyboard-force-release.sh +++ b/extras/keymap/keyboard-force-release.sh.in @@ -6,7 +6,7 @@ case "$2" in /*) scf="$2" ;; - *) scf="/lib/udev/keymaps/force-release/$2" ;; + *) scf="@libexecdir@/keymaps/force-release/$2" ;; esac read attr <"/sys/$1/force_release" diff --git a/extras/mtd_probe/.gitignore b/extras/mtd_probe/.gitignore index 82b8ab501f..70d3e8310e 100644 --- a/extras/mtd_probe/.gitignore +++ b/extras/mtd_probe/.gitignore @@ -1 +1,2 @@ mtd_probe +75-probe_mtd.rules diff --git a/extras/mtd_probe/75-probe_mtd.rules b/extras/mtd_probe/75-probe_mtd.rules.in index 184fda58a9..2e28d37fa3 100644 --- a/extras/mtd_probe/75-probe_mtd.rules +++ b/extras/mtd_probe/75-probe_mtd.rules.in @@ -3,6 +3,6 @@ ACTION!="add", GOTO="mtd_probe_end" KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $tempnode" -KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="/sbin/modprobe -bv sm_ftl" +KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="@sbindir@/modprobe -bv sm_ftl" LABEL="mtd_probe_end" diff --git a/extras/rule_generator/rule_generator.functions b/extras/rule_generator/rule_generator.functions index 4bec27a1b7..0f1b73850e 100644 --- a/extras/rule_generator/rule_generator.functions +++ b/extras/rule_generator/rule_generator.functions @@ -15,10 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -PATH='/sbin:/bin' -# - -PATH='/sbin:/bin' +PATH='/usr/bin:/bin:/usr/sbin:/sbin' # Read a single line from file $1 in the $DEVPATH directory. # The function must not return an error even if the file does not exist. diff --git a/extras/scsi_id/.gitignore b/extras/scsi_id/.gitignore index 8372f68193..10e9ae743c 100644 --- a/extras/scsi_id/.gitignore +++ b/extras/scsi_id/.gitignore @@ -1,2 +1,3 @@ scsi_id +scsi_id.8 scsi_id_version.h diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8 index 0221b98831..8f83f39020 100644 --- a/extras/scsi_id/scsi_id.8 +++ b/extras/scsi_id/scsi_id.8 @@ -33,7 +33,7 @@ by page 0x80. For example: .sp .nf -# /lib/udev/scsi_id \-\-page=0x80 \-\-whitelisted \-\-device=/dev/sda +# /usr/lib/udev/scsi_id \-\-page=0x80 \-\-whitelisted \-\-device=/dev/sda SIBM 3542 1T05078453 .fi .P @@ -45,7 +45,7 @@ identifier starts with the NAA value of 6): .sp .nf -# /lib/udev/scsi_id \-\-page=0x83 \-\-whitelisted \-\-device=/dev/sda +# /usr/lib/udev/scsi_id \-\-page=0x83 \-\-whitelisted \-\-device=/dev/sda 3600a0b80000b174b000000d63efc5c8c .fi .P |