diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2014-08-05 10:09:47 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-08-05 10:14:50 -0400 |
| commit | 602fd80cd69a3ff56c024226bb5488553a1bb43a (patch) | |
| tree | 60978772869c2b358bd70ed4a3e6b7d950aceea6 | |
| parent | dc54fb8a24a8434d488ed2a230341401af6a53e4 (diff) | |
rules: bring up to date
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | rules/42-usb-hid-pm.rules | 15 | ||||
| -rw-r--r-- | rules/60-keyboard.rules | 2 | ||||
| -rw-r--r-- | rules/60-persistent-storage.rules | 3 |
3 files changed, 12 insertions, 8 deletions
diff --git a/rules/42-usb-hid-pm.rules b/rules/42-usb-hid-pm.rules index 483a7811f5..4c300da8c8 100644 --- a/rules/42-usb-hid-pm.rules +++ b/rules/42-usb-hid-pm.rules @@ -2,14 +2,15 @@ # # Enable autosuspend for qemu emulated usb hid devices -# Note that there are buggy qemu versions which advertise remote -# wakeup support but don't actually implement it correctly. This -# is the reason why we need a match for the serial number here. -# The serial number "42" is used to tag the implementations where +# Note that there are buggy qemu versions (0.13 & older) which +# advertise remote wakeup support but don't actually implement +# it correctly. This is the reason why we need a match for the +# serial number here. Old, broken versions have serial "1". +# It has been changed to "42" after fixing the bug to indicate # remote wakeup is working. -ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" -ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" -ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" # Dell DRAC 4 ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto" diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules index 4e0f3663f6..22f71e7792 100644 --- a/rules/60-keyboard.rules +++ b/rules/60-keyboard.rules @@ -1,6 +1,6 @@ # do not edit this file, it will be overwritten on update -ACTION!="add", GOTO="keyboard_end" +ACTION=="remove", GOTO="keyboard_end" KERNEL!="event*", GOTO="keyboard_end" ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end" diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index 4f7163da02..475b151535 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -84,4 +84,7 @@ ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-i ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}" ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="disk/by-partlabel/$env{ID_PART_ENTRY_NAME}" +# add symlink to GPT root disk +ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_GPT_AUTO_ROOT}=="1", SYMLINK+="gpt-auto-root" + LABEL="persistent_storage_end" |