diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2013-04-07 22:52:39 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-04-07 22:52:39 -0400 |
| commit | 215c4a0faa69f3060baa601d32fec5464f8a3362 (patch) | |
| tree | b0a0dde575fefb24af19b25776d91c24dc6d9e22 | |
| parent | df016d6d7abe5b0f8e102d34527d6434f0bec924 (diff) | |
rules/40-mem-null.rules: coalesce with rules/50-udev-default.rules
There is no reason to keep this rule separate and it works fine
when incuded in 50-udev-default.rules.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | rules/40-mem-null.rules | 4 | ||||
| -rw-r--r-- | rules/50-udev-default.rules | 3 | ||||
| -rw-r--r-- | rules/Makefile.am | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/rules/40-mem-null.rules b/rules/40-mem-null.rules deleted file mode 100644 index dab7f853bc..0000000000 --- a/rules/40-mem-null.rules +++ /dev/null @@ -1,4 +0,0 @@ -# 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" diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules index 179065211a..696b790935 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 +# 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=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" diff --git a/rules/Makefile.am b/rules/Makefile.am index cfa8dd9751..baf1654c2d 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -1,7 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} dist_udevrules_DATA = \ - 40-mem-null.rules \ 42-usb-hid-pm.rules \ 50-udev-default.rules \ 60-cdrom_id.rules \ |