rpms/udev/F-7 udev-rules.patch,1.36,1.37 udev.spec,1.208,1.209
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Thu Aug 16 14:11:38 UTC 2007
Author: harald
Update of /cvs/pkgs/rpms/udev/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8636
Modified Files:
udev-rules.patch udev.spec
Log Message:
- readded firmware rule (#252983)
udev-rules.patch:
Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/udev-rules.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- udev-rules.patch 15 Aug 2007 08:17:50 -0000 1.36
+++ udev-rules.patch 16 Aug 2007 14:11:35 -0000 1.37
@@ -1,6 +1,6 @@
--- udev-113/etc/udev/rules.d/60-persistent-storage.rules.rhrules 2007-08-15 10:05:31.000000000 +0200
+++ udev-113/etc/udev/rules.d/60-persistent-storage.rules 2007-08-15 10:07:08.000000000 +0200
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ KERNEL=="sr*|st*", GOTO="persistent_stor
KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
# by-label/by-uuid (filesystem properties)
@@ -46,7 +46,7 @@
# serial+dialup devices
KERNEL=="ippp*", NAME="%k", MODE="0660"
-@@ -43,21 +43,21 @@
+@@ -43,21 +43,21 @@ KERNEL=="hvsi*", NAME="%k
KERNEL=="iseries/vtty*", NAME="%k", GROUP="uucp", MODE="0660"
# vc devices
@@ -81,7 +81,7 @@
# 183 = /dev/hwrng Generic random number generator
KERNEL=="hw_random", NAME="hwrng", SYMLINK+="%k"
-@@ -67,12 +67,18 @@
+@@ -67,12 +67,18 @@ KERNEL=="rtc", MODE="0644"
# floppy devices
KERNEL=="fd[01]*", GROUP="floppy", MODE="0660"
@@ -102,7 +102,7 @@
# audio devices
KERNEL=="dsp*", MODE="0660"
-@@ -99,8 +105,8 @@
+@@ -99,8 +105,8 @@ KERNEL=="usblp*", GROUP="lp", MODE="066
KERNEL=="usb/lp*", GROUP="lp", MODE="0660"
# tape devices
@@ -113,7 +113,7 @@
KERNEL=="ht*", GROUP="disk", MODE="0660"
KERNEL=="nht*", GROUP="disk", MODE="0660"
KERNEL=="pt[0-9]*", GROUP="disk", MODE="0660"
-@@ -155,7 +161,8 @@
+@@ -155,7 +161,8 @@ KERNEL=="slram[0-9]*", SYMLINK+="xpram
# DVB
KERNEL=="dvb", MODE="0660"
@@ -123,7 +123,7 @@
NAME="%c", MODE="0660"
KERNEL=="dm-[0-9]*", ACTION=="add", OPTIONS+="ignore_device"
-@@ -181,6 +188,8 @@
+@@ -181,6 +188,8 @@ KERNEL=="raw1394", NAME="%k"
KERNEL=="dv1394*", NAME="dv1394/%n"
KERNEL=="video1394*", NAME="video1394/%n"
@@ -132,7 +132,7 @@
KERNEL=="raw[0-9]*", NAME="raw/%k"
KERNEL=="lp[0-9]*", SYMLINK+="par%n"
-@@ -227,89 +236,51 @@
+@@ -227,89 +236,51 @@ KERNEL=="zap[0-9]*", NAME="zap/%n"
KERNEL=="pktcdvd", NAME="%k/control"
@@ -249,7 +249,7 @@
# sd: 0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
# sr: 4 TYPE_WORM, 5 TYPE_ROM
-@@ -321,11 +292,11 @@
+@@ -321,11 +292,11 @@ ACTION=="add", SUBSYSTEM=="scsi" , ATTRS
RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
@@ -264,7 +264,7 @@
ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
SYMLINK+="scanner scanner-%k", MODE="0660"
-@@ -333,15 +304,18 @@
+@@ -333,15 +304,18 @@ ACTION=="add", KERNEL=="sg[0-9]*", BUS==
ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \
SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
@@ -290,9 +290,9 @@
RUN+="socket:/org/kernel/udev/monitor"
---- /dev/null 2007-07-17 14:43:58.691704070 +0200
-+++ udev-113/etc/udev/redhat/06-udev-rh-early.rules 2007-08-15 10:12:00.000000000 +0200
-@@ -0,0 +1,13 @@
+--- /dev/null 2007-08-16 13:04:33.725609596 +0200
++++ udev-113/etc/udev/redhat/06-udev-rh-early.rules 2007-08-15 10:16:50.000000000 +0200
+@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="drivers_end"
@@ -304,6 +304,7 @@
+SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
+SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
++SUBSYSTEM=="firmware", ENV{FIRMWARE}=="?*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
+
+LABEL="drivers_end"
--- udev-113/etc/udev/redhat/05-udev-early.rules.rhrules 2007-06-23 17:44:48.000000000 +0200
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/udev.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- udev.spec 15 Aug 2007 08:17:50 -0000 1.208
+++ udev.spec 16 Aug 2007 14:11:35 -0000 1.209
@@ -6,7 +6,7 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 113
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPL
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -342,6 +342,9 @@
%{_libdir}/pkgconfig/libvolume_id.pc
%changelog
+* Thu Aug 16 2007 Harald Hoyer <harald at redhat.com> - 113-11
+- readded firmware rule (#252983)
+
* Wed Aug 15 2007 Harald Hoyer <harald at redhat.com> - 113-10
- do not run vol_id on non-partition block devices (bug #251401)
- read all multiline pnp modaliases again
More information about the fedora-extras-commits
mailing list