diff options
| author |   Kay Sievers <kay@vrfy.org> | 2015-03-12 16:34:18 +0100 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2015-03-18 15:44:36 -0400 |
| commit | 51ed849fb0ce93dc37776bcf7676082cc9c1d203 (patch) | |
| tree | a86aacd83a318092c30f11f724480a716ddccb93 | |
| parent | rules: default - remove legacy agpgart (diff) | |
| download | eudev-51ed849fb0ce93dc37776bcf7676082cc9c1d203.tar.gz eudev-51ed849fb0ce93dc37776bcf7676082cc9c1d203.tar.bz2 eudev-51ed849fb0ce93dc37776bcf7676082cc9c1d203.zip | |
rules: merge udev-late.rules files
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | rules/50-udev-default.rules | 7 | ||||
| -rw-r--r-- | rules/95-udev-late.rules | 4 | ||||
| -rw-r--r-- | rules/Makefile.am | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules index d83add20a..03a42f0d0 100644 --- a/rules/50-udev-default.rules +++ b/rules/50-udev-default.rules @@ -1,5 +1,8 @@ # do not edit this file, it will be overwritten on update +# run a command on remove events +ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" + SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" # select "system RTC" or just use the first one @@ -10,7 +13,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{b SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" -ACTION!="add", GOTO="default_permissions_end" +ACTION!="add", GOTO="default_end" SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666" @@ -70,4 +73,4 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" -LABEL="default_permissions_end" +LABEL="default_end" diff --git a/rules/95-udev-late.rules b/rules/95-udev-late.rules deleted file mode 100644 index eca0faa5c..000000000 --- a/rules/95-udev-late.rules +++ /dev/null @@ -1,4 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# run a command on remove events -ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" diff --git a/rules/Makefile.am b/rules/Makefile.am index 487f68cc7..54fff4969 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -20,8 +20,7 @@ dist_udevrules_DATA = \ 75-probe_mtd.rules \ 75-tty-description.rules \ 78-sound-card.rules \ - 80-net-name-slot.rules \ - 95-udev-late.rules + 80-net-name-slot.rules if HAVE_BLKID dist_udevrules_DATA += \ |