diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2014-01-11 20:46:58 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-01-11 20:46:58 -0500 |
| commit | 248ea81923ce671979ccbe0bca5683d4239feb70 (patch) | |
| tree | bd41e8d81a2eb89cbc757c7464b569370b852300 | |
| parent | d4a1c1bcf018b4beb6628e22d9014322ffc79628 (diff) | |
rules: bring up to date with upstream.
Note: some of these rules are premature because we have yet
to add udev_builtin_net_link. These commits were authored by
Kay Sievers
David Herrmann
Tom Gundersen
Lennart Poettering
Bastien Nocera
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | rules/50-udev-default.rules | 9 | ||||
| -rw-r--r-- | rules/60-drm.rules | 3 | ||||
| -rw-r--r-- | rules/80-drivers.rules | 14 | ||||
| -rw-r--r-- | rules/80-net-setup-link.rules | 13 |
4 files changed, 25 insertions, 14 deletions
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules index a53d738377..679dfdfcf4 100644 --- a/rules/50-udev-default.rules +++ b/rules/50-udev-default.rules @@ -1,8 +1,5 @@ # do not edit this file, it will be overwritten on update -# Support for Linux 2.6.32, see https://bugs.gentoo.org/show_bug.cgi?id=457868 -SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666" - SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" # select "system RTC" or just use the first one @@ -23,9 +20,7 @@ KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP= SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" -SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" -SUBSYSTEM=="input", KERNEL=="ts[0-9]*|uinput", MODE="0640" -SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0644" +SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0664" SUBSYSTEM=="video4linux", GROUP="video" SUBSYSTEM=="misc", KERNEL=="agpgart", GROUP="video" @@ -66,7 +61,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk" SUBSYSTEM=="aoe", GROUP="disk", MODE="0220" SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" -KERNEL=="rfkill", MODE="0644" +KERNEL=="rfkill", MODE="0664" KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" diff --git a/rules/60-drm.rules b/rules/60-drm.rules new file mode 100644 index 0000000000..1ed3e445f2 --- /dev/null +++ b/rules/60-drm.rules @@ -0,0 +1,3 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="remove", SUBSYSTEM=="drm", SUBSYSTEMS=="pci|usb|platform", IMPORT{builtin}="path_id" diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules index 0b22d73ce5..8551f47a4b 100644 --- a/rules/80-drivers.rules +++ b/rules/80-drivers.rules @@ -2,12 +2,12 @@ ACTION=="remove", GOTO="drivers_end" -ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}="kmod load tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}="kmod load tifm_ms" -SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block" -SUBSYSTEM=="i2o", RUN{builtin}="kmod load i2o_block" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev" -KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN{builtin}="kmod load sm_ftl" +ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}+="kmod load tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}+="kmod load tifm_ms" +SUBSYSTEM=="memstick", RUN{builtin}+="kmod load ms_block mspro_block" +SUBSYSTEM=="i2o", RUN{builtin}+="kmod load i2o_block" +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}+="kmod load ppdev" +KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN{builtin}+="kmod load sm_ftl" LABEL="drivers_end" diff --git a/rules/80-net-setup-link.rules b/rules/80-net-setup-link.rules new file mode 100644 index 0000000000..6e411a91f0 --- /dev/null +++ b/rules/80-net-setup-link.rules @@ -0,0 +1,13 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="net", GOTO="net_setup_link_end" + +IMPORT{builtin}="path_id" + +ACTION!="add", GOTO="net_setup_link_end" + +IMPORT{builtin}="net_setup_link" + +NAME=="", ENV{ID_NET_NAME}!="", NAME="$env{ID_NET_NAME}" + +LABEL="net_setup_link_end" |