rpms/udev/devel udev-078-redhat.patch, 1.4, 1.5 udev.spec, 1.140, 1.141
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 24 12:37:16 UTC 2006
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17145
Modified Files:
udev-078-redhat.patch udev.spec
Log Message:
- put WAIT_FOR_SYSFS rules in 05-udev-early.rules
udev-078-redhat.patch:
etc/udev/redhat/05-udev-early.rules | 8 +
etc/udev/redhat/hotplug.rules | 13 ++
etc/udev/redhat/udev.rules | 95 +++++++++++----------
extras/check-cdrom.sh | 39 ++++++++
extras/floppy/create_floppy_devices.c | 6 +
extras/ide-media.sh | 7 +
extras/load_floppy_module.sh | 35 +++++++
extras/run_directory/MAKEDEV.dev | 38 ++++++++
extras/run_directory/dev.d/default/pam_console.dev | 18 ---
extras/udevpermconv.sh | 94 ++++++++++++++++++++
10 files changed, 291 insertions(+), 62 deletions(-)
Index: udev-078-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-078-redhat.patch 23 Jan 2006 10:38:21 -0000 1.4
+++ udev-078-redhat.patch 24 Jan 2006 12:37:12 -0000 1.5
@@ -1,22 +1,14 @@
--- udev-078/etc/udev/redhat/udev.rules.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/etc/udev/redhat/udev.rules 2006-01-23 11:29:30.000000000 +0100
-@@ -3,6 +3,15 @@
++++ udev-078/etc/udev/redhat/udev.rules 2006-01-24 12:48:17.000000000 +0100
+@@ -3,6 +3,7 @@
#
# default is OWNER="root" GROUP="root", MODE="0600"
#
+
-+# ignore these events until someone needs them
-+SUBSYSTEM=="drivers", OPTIONS="last_rule"
-+SUBSYSTEM=="module", OPTIONS="last_rule"
-+
-+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-+ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-+
KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
# all block devices
-@@ -10,40 +19,44 @@
+@@ -10,40 +11,44 @@
KERNEL=="root", GROUP="disk", MODE="0640"
# console devices
@@ -87,7 +79,7 @@
# memory devices
KERNEL=="random", MODE="0666", OPTIONS="last_rule"
-@@ -54,6 +67,8 @@
+@@ -54,6 +59,8 @@
KERNEL=="full", MODE="0666", OPTIONS="last_rule"
KERNEL=="null", MODE="0666", OPTIONS="last_rule"
KERNEL=="zero", MODE="0666", OPTIONS="last_rule"
@@ -96,7 +88,7 @@
# misc devices
KERNEL=="nvram", MODE="0660"
-@@ -61,6 +76,10 @@
+@@ -61,6 +68,10 @@
# floppy devices
KERNEL=="fd[01]*", GROUP="floppy", MODE="0660"
@@ -107,7 +99,7 @@
# audio devices
KERNEL=="dsp*", MODE="0660"
-@@ -209,7 +228,7 @@
+@@ -209,7 +220,7 @@
KERNEL=="fd[0-9]*", SYMLINK+="floppy%e"
KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660"
KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660"
@@ -116,7 +108,7 @@
KERNEL=="umad*", NAME="infiniband/%k"
KERNEL=="issm*", NAME="infiniband/%k"
-@@ -224,24 +243,25 @@
+@@ -224,24 +235,25 @@
BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
# do not seperate the next 2 lines!!
@@ -150,7 +142,7 @@
#######################################
# Persistent block device stuff - begin
-@@ -301,19 +321,11 @@
+@@ -301,19 +313,11 @@
# Perhaps this should just be for all subsystems?
@@ -171,13 +163,24 @@
ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
RUN+="/sbin/modprobe sd_mod"
ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
-@@ -331,3 +343,6 @@
+@@ -331,3 +335,6 @@
ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
RUN+="/sbin/firmware_helper"
+
+RUN+="socket:/org/kernel/udev/monitor"
+
+--- udev-078/etc/udev/redhat/05-udev-early.rules.redhat 2006-01-24 12:47:48.000000000 +0100
++++ udev-078/etc/udev/redhat/05-udev-early.rules 2006-01-24 12:47:41.000000000 +0100
+@@ -0,0 +1,8 @@
++# sysfs is populated after the event is sent
++ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
++ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
++
++# ignore these events until someone needs them
++SUBSYSTEM=="drivers", OPTIONS="ignore_device"
++SUBSYSTEM=="module", OPTIONS="ignore_device"
++
--- udev-078/etc/udev/redhat/hotplug.rules.redhat 2005-12-17 16:40:29.000000000 +0100
+++ udev-078/etc/udev/redhat/hotplug.rules 2006-01-23 11:21:53.000000000 +0100
@@ -1,8 +1,15 @@
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- udev.spec 23 Jan 2006 10:39:02 -0000 1.140
+++ udev.spec 24 Jan 2006 12:37:12 -0000 1.141
@@ -5,7 +5,7 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 078
-Release: 6
+Release: 7
License: GPL
Group: System Environment/Base
Provides: udev-persistent = 0:%{version}-%{release}
@@ -138,6 +138,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,makedev.d,scripts,devices}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
+install -m 0644 etc/udev/redhat/05-udev-early.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-udev-early.rules
install -m 0644 etc/udev/redhat/udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
# Backwards compat
install -m 0644 etc/udev/redhat/hotplug.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-hotplug.rules
@@ -263,6 +264,7 @@
%config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
+%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/05-udev-early.rules
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/51-hotplug.rules
%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
@@ -280,6 +282,9 @@
%attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
%changelog
+* Tue Jan 24 2006 Harald Hoyer <harald at redhat.com> - 078-7
+- put WAIT_FOR_SYSFS rules in 05-udev-early.rules
+
* Mon Jan 23 2006 Harald Hoyer <harald at redhat.com> - 078-6
- added some WAIT_FOR_SYSFS rules
- removed warning message, if udev_db is not available
More information about the fedora-cvs-commits
mailing list