From c0c7592589901c24d9440d68004569ee3580935f Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Mon, 15 Jan 2007 14:00:05 +0000 Subject: Removed second set of rules for cd-devices, solving Bug #158060. svn path=/; revision=3 --- udev-bugs/sys-fs/udev/ChangeLog | 4 ++++ udev-bugs/sys-fs/udev/Manifest | 16 ++++++++-------- udev-bugs/sys-fs/udev/files/udev.rules-103-r1 | 10 +++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/udev-bugs/sys-fs/udev/ChangeLog b/udev-bugs/sys-fs/udev/ChangeLog index 86bf732..3f4de5d 100644 --- a/udev-bugs/sys-fs/udev/ChangeLog +++ b/udev-bugs/sys-fs/udev/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Jan 2007; Matthias Schwarzott + files/udev.rules-103-r1: + Removed second set of rules for cd-devices, solving Bug #158060. + 15 Jan 2007; Matthias Schwarzott +files/udev.rules-103-r1, udev-103-r1.ebuild: Made own copy of rules-file. diff --git a/udev-bugs/sys-fs/udev/Manifest b/udev-bugs/sys-fs/udev/Manifest index c66ace3..962914b 100644 --- a/udev-bugs/sys-fs/udev/Manifest +++ b/udev-bugs/sys-fs/udev/Manifest @@ -22,10 +22,10 @@ AUX udev.rules-098 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae SHA1 52 MD5 295a9b7bdc8bdb239f8860d14af761b0 files/udev.rules-098 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae files/udev.rules-098 10095 SHA256 211d8d7820f0bb474f0ffad172359fc3b9f5064422ee68af5961558df0e1dcac files/udev.rules-098 10095 -AUX udev.rules-103-r1 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae SHA1 5286733c62564e6ce708666d1c372c639373d484 SHA256 211d8d7820f0bb474f0ffad172359fc3b9f5064422ee68af5961558df0e1dcac -MD5 295a9b7bdc8bdb239f8860d14af761b0 files/udev.rules-103-r1 10095 -RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae files/udev.rules-103-r1 10095 -SHA256 211d8d7820f0bb474f0ffad172359fc3b9f5064422ee68af5961558df0e1dcac files/udev.rules-103-r1 10095 +AUX udev.rules-103-r1 9650 RMD160 e29642466453811c6770246a33d6dc082fd3aef6 SHA1 92da3c9732596143641fd4454364fbb75830dc2d SHA256 c4b1cfc5387b75f8f741dc5b6bfcac05c26bd51dcba2a481d4c05537af9f1341 +MD5 4e6f9a78c966cbc2f4c1ba160a1187d8 files/udev.rules-103-r1 9650 +RMD160 e29642466453811c6770246a33d6dc082fd3aef6 files/udev.rules-103-r1 9650 +SHA256 c4b1cfc5387b75f8f741dc5b6bfcac05c26bd51dcba2a481d4c05537af9f1341 files/udev.rules-103-r1 9650 DIST udev-103.tar.bz2 200027 RMD160 3b00a83ad8c538109ee030e2e471422272c7d071 SHA1 015372f585beeba05217ad6568178820b2713571 SHA256 047f5e2895f707117ab726cedd89fd35e8c9105530af54a8038fe81cf61c4e3f EBUILD udev-103-r1.ebuild 11303 RMD160 89f1dda77fd1ee46a4fe8ab086da02f42247d44c SHA1 383775ffc83792abec5f4e7e0f81eaacee9ffeeb SHA256 fa993bbd79ef9800a0e8dd5ef2d17bb086742294732498aecc43cee24affc4d3 MD5 bca42087041920c426467a11644da632 udev-103-r1.ebuild 11303 @@ -35,10 +35,10 @@ EBUILD udev-103.ebuild 11291 RMD160 88c3627c0dbbdbef73d0f5c52c448d3f8b051c02 SHA MD5 77d8d60dc3d66f8d617eee26f7027908 udev-103.ebuild 11291 RMD160 88c3627c0dbbdbef73d0f5c52c448d3f8b051c02 udev-103.ebuild 11291 SHA256 4a62f7bd8adbd0bca064d9b25765e4b3447b559d2db49a6fef38dd0a77909bbb udev-103.ebuild 11291 -MISC ChangeLog 532 RMD160 a52872beaec393c483d8f4578eee6ce9cf9f5cbb SHA1 134eacab46007b3f29de0b8ad53aebf54fdfedec SHA256 69d5907e4b6ffe2182521725cccd35eab17dee4d4a78704dae4621573b7bb05b -MD5 141d649ba818f9ceabaf94b9d476d185 ChangeLog 532 -RMD160 a52872beaec393c483d8f4578eee6ce9cf9f5cbb ChangeLog 532 -SHA256 69d5907e4b6ffe2182521725cccd35eab17dee4d4a78704dae4621573b7bb05b ChangeLog 532 +MISC ChangeLog 680 RMD160 7d3289a73f662f3ae9546a292a1274d498c1a962 SHA1 b2e194207dacb776e1fc253e67ca4ee802d71278 SHA256 f949f5d9b17935de6650d7c80ff14322fbedba11731d098283887a79083bd2f1 +MD5 597c9d55925ba9bbdc71064c62a7dc12 ChangeLog 680 +RMD160 7d3289a73f662f3ae9546a292a1274d498c1a962 ChangeLog 680 +SHA256 f949f5d9b17935de6650d7c80ff14322fbedba11731d098283887a79083bd2f1 ChangeLog 680 MD5 0a038fef39f2c8ccb4a613719e0f817b files/digest-udev-103 229 RMD160 fd217b32f070097ae37ba5ee5a96a84faab5edef files/digest-udev-103 229 SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/digest-udev-103 229 diff --git a/udev-bugs/sys-fs/udev/files/udev.rules-103-r1 b/udev-bugs/sys-fs/udev/files/udev.rules-103-r1 index bc1c84d..612fb51 100644 --- a/udev-bugs/sys-fs/udev/files/udev.rules-103-r1 +++ b/udev-bugs/sys-fs/udev/files/udev.rules-103-r1 @@ -33,14 +33,10 @@ KERNEL=="ircomm*", NAME="%k", GROUP="tty" SUBSYSTEM=="block", GROUP="disk" # cdrom symlinks and other good cdrom naming -BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode" -BUS=="scsi", KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode" -BUS=="scsi", KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode" +KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" + +ENV{ID_CDROM}=="?*", GROUP="cdrom" BUS=="scsi", KERNEL=="sg[0-9]*", ACTION=="add", DRIVERS=="sr", GROUP="cdrom" -ENV{ID_CDROM}=="?*", PROGRAM="seq_node.sh %r %k cdrom", SYMLINK+="%c", GROUP="cdrom" -ENV{ID_CDROM_CD_RW}=="?*", PROGRAM="seq_node.sh %r %k cdrw", SYMLINK+="%c" -ENV{ID_CDROM_DVD}=="?*", PROGRAM="seq_node.sh %r %k dvd", SYMLINK+="%c" -ENV{ID_CDROM_DVD_R}=="?*", PROGRAM="seq_node.sh %r %k dvdrw", SYMLINK+="%c" # disk devices KERNEL=="sd*", NAME="%k", GROUP="disk" -- cgit v1.2.3-65-gdbad