rpms/udev/devel udev-116-rhrules.patch,1.1,1.2

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13343

Modified Files:
	udev-116-rhrules.patch 
Log Message:
- do not change sg group ownership to disk for scanners (rhbz#432602)


udev-116-rhrules.patch:

Index: udev-116-rhrules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-116-rhrules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-116-rhrules.patch	8 Jan 2008 13:29:53 -0000	1.1
+++ udev-116-rhrules.patch	20 Feb 2008 11:36:39 -0000	1.2
@@ -1,7 +1,24 @@
-diff -up udev-116/etc/udev/redhat/40-redhat.rules.rhrules udev-116/etc/udev/redhat/40-redhat.rules
---- udev-116/etc/udev/redhat/40-redhat.rules.rhrules	2008-01-08 12:25:00.000000000 +0100
-+++ udev-116/etc/udev/redhat/40-redhat.rules	2008-01-08 12:25:53.000000000 +0100
-@@ -9,8 +9,6 @@ ACTION=="add", KERNEL=="sg[0-9]*", BUS==
+diff -up udev-118/etc/udev/rules.d/50-udev-default.rules.rhrules udev-118/etc/udev/rules.d/50-udev-default.rules
+--- udev-118/etc/udev/rules.d/50-udev-default.rules.rhrules	2007-12-19 00:50:56.000000000 +0100
++++ udev-118/etc/udev/rules.d/50-udev-default.rules	2008-02-20 12:17:26.000000000 +0100
+@@ -67,7 +67,7 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{
+ KERNEL=="fd[0-9]",		GROUP="floppy"
+ KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
+ KERNEL=="sch[0-9]*",		GROUP="disk"
+-KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
++KERNEL=="sg[0-9]*", ATTRS{type}!="3|6",	GROUP="disk", MODE="0640"
+ KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
+ KERNEL=="pg[0-9]*",		GROUP="disk"
+ KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
+diff -up udev-118/etc/udev/redhat/40-redhat.rules.rhrules udev-118/etc/udev/redhat/40-redhat.rules
+--- udev-118/etc/udev/redhat/40-redhat.rules.rhrules	2007-12-19 00:50:56.000000000 +0100
++++ udev-118/etc/udev/redhat/40-redhat.rules	2008-02-20 12:19:07.000000000 +0100
+@@ -5,12 +5,10 @@ KERNEL=="hd*[0-9]", ATTRS{media}=="flopp
+ 
+ KERNEL=="fw*", PROGRAM="fw_unit_symlinks.sh %k %n", SYMLINK+="$result"
+ 
+-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", SYMLINK+="scanner scanner-%k", MODE="0660"
++ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="3|6", SYMLINK+="scanner scanner-%k", MODE="0660"
  
  ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"