diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-17 11:22:16 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-17 11:22:16 +0100 |
| commit | e735f4d4eafc8c8c296cefc8228cf91c3fcfe822 (patch) | |
| tree | 6626785ac2b212cc52282387a0a0d8a20fee8db2 /rules | |
| parent | f47781d88ca6bf69d6b1dd0703b2b283482e5c09 (diff) | |
| download | systemd-e735f4d4eafc8c8c296cefc8228cf91c3fcfe822.tar.gz | |
Imported Upstream version 219
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/60-cdrom_id.rules | 5 | ||||
| -rw-r--r-- | rules/60-persistent-storage.rules | 2 | ||||
| -rw-r--r-- | rules/70-mouse.rules | 3 | ||||
| -rw-r--r-- | rules/70-touchpad.rules | 12 |
4 files changed, 21 insertions, 1 deletions
diff --git a/rules/60-cdrom_id.rules b/rules/60-cdrom_id.rules index 6eaf76a72c..5c3b52ebb9 100644 --- a/rules/60-cdrom_id.rules +++ b/rules/60-cdrom_id.rules @@ -15,6 +15,11 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", GOTO="cdr # enable the receiving of media eject button events IMPORT{program}="cdrom_id --lock-media $devnode" +# ejecting a CD does not remove the device node, so mark the systemd device +# unit as inactive while there is no medium; this automatically cleans up of +# stale mounts after ejecting +ENV{DISK_MEDIA_CHANGE}=="?*", ENV{ID_CDROM_MEDIA}!="?*", ENV{SYSTEMD_READY}="0" + KERNEL=="sr0", SYMLINK+="cdrom", OPTIONS+="link_priority=-100" LABEL="cdrom_end" diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index 475b151535..25b44a55cb 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_ SUBSYSTEM!="block", GOTO="persistent_storage_end" # skip rules for inappropriate block devices -KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*", GOTO="persistent_storage_end" +KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*|mmcblk[0-9]*rpmb", GOTO="persistent_storage_end" # ignore partitions that span the entire disk TEST=="whole_disk", GOTO="persistent_storage_end" diff --git a/rules/70-mouse.rules b/rules/70-mouse.rules index 0e359e83f1..3ea743aff9 100644 --- a/rules/70-mouse.rules +++ b/rules/70-mouse.rules @@ -11,5 +11,8 @@ KERNELS=="input*", ENV{ID_BUS}=="usb", \ KERNELS=="input*", ENV{ID_BUS}=="bluetooth", \ IMPORT{builtin}="hwdb 'mouse:$env{ID_BUS}:v$attr{id/vendor}p$attr{id/product}:name:$attr{name}:'", \ GOTO="mouse_end" +DRIVERS=="psmouse", SUBSYSTEMS=="serio", \ + IMPORT{builtin}="hwdb 'mouse:ps2::name:$attr{device/name}:'", \ + GOTO="mouse_end" LABEL="mouse_end" diff --git a/rules/70-touchpad.rules b/rules/70-touchpad.rules new file mode 100644 index 0000000000..88e6fd2f25 --- /dev/null +++ b/rules/70-touchpad.rules @@ -0,0 +1,12 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="touchpad_end" +KERNEL!="event*", GOTO="touchpad_end" +ENV{ID_INPUT_TOUCHPAD}=="", GOTO="touchpad_end" + +# touchpad:pnpid:<pnpid>:* +KERNELS=="serio1", \ + IMPORT{builtin}="hwdb 'touchpad:pnpid:$attr{firmware_id}:'", \ + GOTO="touchpad_end" + +LABEL="touchpad_end" |