rpms/udev/devel udev-078-redhat.patch, 1.1, 1.2 udev.spec, 1.133, 1.134
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 23 12:41:36 UTC 2005
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7763
Modified Files:
udev-078-redhat.patch udev.spec
Log Message:
- fixed floppy module loading
- added monitor socket
- fixed typo in dvb rule
udev-078-redhat.patch:
etc/udev/redhat/udev.rules | 87 +++++++++++--------
extras/check-cdrom.sh | 39 ++++++++
extras/ide-media.sh | 7 +
extras/load_floppy_modules.sh | 35 +++++++
extras/run_directory/MAKEDEV.dev | 38 ++++++++
extras/run_directory/dev.d/default/pam_console.dev | 18 ----
extras/udevpermconv.sh | 94 +++++++++++++++++++++
7 files changed, 270 insertions(+), 48 deletions(-)
Index: udev-078-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-078-redhat.patch 21 Dec 2005 11:36:19 -0000 1.1
+++ udev-078-redhat.patch 23 Dec 2005 12:41:33 -0000 1.2
@@ -1,5 +1,5 @@
--- udev-078/etc/udev/redhat/udev.rules.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/etc/udev/redhat/udev.rules 2005-12-21 12:06:41.000000000 +0100
++++ udev-078/etc/udev/redhat/udev.rules 2005-12-23 13:35:57.000000000 +0100
@@ -3,6 +3,11 @@
#
# default is OWNER="root" GROUP="root", MODE="0600"
@@ -12,7 +12,7 @@
KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
# all block devices
-@@ -10,40 +15,43 @@
+@@ -10,40 +15,44 @@
KERNEL=="root", GROUP="disk", MODE="0640"
# console devices
@@ -67,6 +67,7 @@
+KERNEL=="hvsi*", NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="iseries/vtty*", NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
++KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
# vc devices
-KERNEL=="vcs", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
@@ -82,7 +83,7 @@
# memory devices
KERNEL=="random", MODE="0666", OPTIONS="last_rule"
-@@ -54,6 +62,8 @@
+@@ -54,6 +63,8 @@
KERNEL=="full", MODE="0666", OPTIONS="last_rule"
KERNEL=="null", MODE="0666", OPTIONS="last_rule"
KERNEL=="zero", MODE="0666", OPTIONS="last_rule"
@@ -91,7 +92,7 @@
# misc devices
KERNEL=="nvram", MODE="0660"
-@@ -61,6 +71,10 @@
+@@ -61,6 +72,10 @@
# floppy devices
KERNEL=="fd[01]*", GROUP="floppy", MODE="0660"
@@ -102,7 +103,7 @@
# audio devices
KERNEL=="dsp*", MODE="0660"
-@@ -224,24 +238,25 @@
+@@ -224,24 +239,25 @@
BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
# do not seperate the next 2 lines!!
@@ -132,12 +133,19 @@
-KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
+# dvb
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
#######################################
# Persistent block device stuff - begin
+@@ -331,3 +347,6 @@
+
+ ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
+ RUN+="/sbin/firmware_helper"
++
++RUN+="socket:/org/kernel/udev/monitor"
++
--- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/ide-media.sh 2005-12-21 11:56:47.000000000 +0100
++++ udev-078/extras/ide-media.sh 2005-12-23 08:34:06.000000000 +0100
@@ -0,0 +1,7 @@
+#!/bin/bash
+i=0
@@ -147,7 +155,7 @@
+done
+/bin/cat /proc/ide/$1/media
--- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/run_directory/MAKEDEV.dev 2005-12-21 11:56:47.000000000 +0100
++++ udev-078/extras/run_directory/MAKEDEV.dev 2005-12-23 08:34:06.000000000 +0100
@@ -0,0 +1,38 @@
+#!/bin/sh
+
@@ -188,7 +196,7 @@
+ /sbin/pam_console_apply $DEVNAME*
+fi
--- udev-078/extras/run_directory/dev.d/default/pam_console.dev.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2005-12-21 11:56:47.000000000 +0100
++++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2005-12-23 08:34:06.000000000 +0100
@@ -1,16 +1,11 @@
#!/bin/sh
@@ -231,7 +239,7 @@
+ /sbin/pam_console_apply "$DEVNAME" $DEVLINKS
fi
--- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/check-cdrom.sh 2005-12-21 11:56:47.000000000 +0100
++++ udev-078/extras/check-cdrom.sh 2005-12-23 08:34:06.000000000 +0100
@@ -0,0 +1,39 @@
+#!/bin/bash
+
@@ -273,7 +281,7 @@
+ exit 1
+}
--- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/udevpermconv.sh 2005-12-21 11:56:47.000000000 +0100
++++ udev-078/extras/udevpermconv.sh 2005-12-23 08:34:06.000000000 +0100
@@ -0,0 +1,94 @@
+#!/bin/bash
+#
@@ -369,8 +377,8 @@
+
+processInput
+exit 0
---- udev-078/extras/load_floppy_modules.sh.redhat 2005-12-21 11:59:45.000000000 +0100
-+++ udev-078/extras/load_floppy_modules.sh 2005-12-21 12:00:49.000000000 +0100
+--- /dev/null 2005-12-16 16:12:26.451912136 +0100
++++ udev-078/extras/load_floppy_modules.sh 2005-12-23 08:34:06.000000000 +0100
@@ -0,0 +1,35 @@
+#!/bin/sh
+########################################################################
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- udev.spec 21 Dec 2005 22:43:32 -0000 1.133
+++ udev.spec 23 Dec 2005 12:41:33 -0000 1.134
@@ -168,14 +168,9 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
install -m 0644 extras/path_id $RPM_BUILD_ROOT/sbin/path_id
+install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
-# floppy madness
-for i in 0 1 2 3;do
- mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/fd$i
- ln -s %{udev_scriptdir}/MAKEDEV.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/fd$i/10-MAKEDEV.dev
-done
-install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
@@ -284,6 +279,11 @@
%attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
%changelog
+* Fri Dec 23 2005 Harald Hoyer <harald at redhat.com> - 078-3
+- fixed floppy module loading
+- added monitor socket
+- fixed typo in dvb rule
+
* Wed Dec 21 2005 Bill Nottingham <notting at redhat.com> - 078-2
- udevstart change: allow greylisting of certain modaliases (usb, firewire)
More information about the fedora-cvs-commits
mailing list