rpms/udev/devel udev-post.init, NONE, 1.1 udev-rules.patch, 1.41, 1.42 udev.spec, 1.212, 1.213 upstream, 1.7, 1.8 firmware_helper.c, 1.2, NONE udev-095-dbgwait.patch, 1.1, NONE udev-extras.patch, 1.3, NONE udev-permconv.patch, 1.1, NONE

Harald Hoyer (harald) fedora-extras-commits at redhat.com
Fri Aug 10 14:37:17 UTC 2007


Author: harald

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

Modified Files:
	udev-rules.patch udev.spec upstream 
Added Files:
	udev-post.init 
Removed Files:
	firmware_helper.c udev-095-dbgwait.patch udev-extras.patch 
	udev-permconv.patch 
Log Message:
- version 114
- big rule unification and cleanup
- added persistent names for network and cdrom devices over reboot



--- NEW FILE udev-post.init ---
#!/bin/bash
#
# udev-post     Post script for udev, after all filesystems are mounted
#
# Authors:      Harald Hoyer <harald at redhat.com>
#
# chkconfig: 345 26 75
# description: Moves the generated persistent udev rules to /etc/udev/rules.d
# 
### BEGIN INIT INFO
# Requires: $local_fs
### END INIT INFO

. /etc/rc.d/init.d/functions

# See how we were called.
case "$1" in
  start)
	STRING=$"Adding udev persistent rules"
	
	# copy the rules generated before / was mounted read-write
	for file in /dev/.udev/tmp-rules--*; do
		dest=${file##*tmp-rules--}
		# check, if anything is todo
		[ "$dest" = '*' ] && exit 0
		echo -n $STRING 
		cat $file >> /etc/udev/rules.d/$dest
		rc=$?
		rm -f $file
		if [ "$rc" -eq "0" ]; then
			success "$STRING"
			echo
		elif [ "$rc" -eq "1" ]; then
			failure "$STRING"
			echo
            	fi
	done
	exit 0
	;;
  stop)
	exit 0
	;;
  *)
        echo $"Usage: $0 {start}"
        exit 1
esac
exit 0

udev-rules.patch:

Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- udev-rules.patch	27 Jul 2007 16:51:38 -0000	1.41
+++ udev-rules.patch	10 Aug 2007 14:37:15 -0000	1.42
@@ -1,314 +1,30 @@
---- udev-113/etc/udev/redhat/50-udev.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/etc/udev/redhat/50-udev.rules	2007-07-27 18:41:46.000000000 +0200
-@@ -4,25 +4,25 @@
- # default is OWNER="root" GROUP="root", MODE="0600"
- #
- 
--KERNEL=="*", OWNER="root" GROUP="root", MODE="0600"
-+KERNEL=="*", OWNER="root", GROUP="root", MODE="0600"
- 
- # all block devices
- SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
- KERNEL=="root",			GROUP="disk", MODE="0640"
- 
- # console devices
--KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
--KERNEL=="console",              NAME="%k", MODE="0600", OPTIONS="last_rule"
--KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666"
-+KERNEL=="console",              NAME="%k", MODE="0600" 
-+KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660"
-+KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660"
- 
- # pty devices
- #  Set this to 0660 if you only want users belonging to tty group
- #  to be able to allocate PTYs
--KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
--KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
--KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
--KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666"
-+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660"
-+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660"
-+KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660"
- 
- # serial+dialup devices
- KERNEL=="ippp*",		NAME="%k", MODE="0660"
-@@ -43,21 +43,21 @@
- KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
- 
- # vc devices
--KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty"
-+KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty"
-+KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty"
-+KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty"
-+KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty"
- 
- # memory devices
--KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
--KERNEL=="urandom",		MODE="0444", OPTIONS="last_rule"
--KERNEL=="mem",			GROUP="kmem", MODE="0640", OPTIONS="last_rule"
--KERNEL=="kmem",			GROUP="kmem", MODE="0640", OPTIONS="last_rule"
--KERNEL=="port",			GROUP="kmem", MODE="0640", OPTIONS="last_rule"
--KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
--KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
--KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
-+KERNEL=="random",		MODE="0666"
-+KERNEL=="urandom",		MODE="0444"
-+KERNEL=="mem",			GROUP="kmem", MODE="0640"
-+KERNEL=="kmem",			GROUP="kmem", MODE="0640"
-+KERNEL=="port",			GROUP="kmem", MODE="0640"
-+KERNEL=="full",			MODE="0666"
-+KERNEL=="null",			MODE="0666"
-+KERNEL=="zero",			MODE="0666"
- # 183 = /dev/hwrng        Generic random number generator
- KERNEL=="hw_random",            NAME="hwrng", SYMLINK+="%k"
- 
-@@ -67,12 +67,18 @@
- 
- # floppy devices
- KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
+--- /dev/null	2007-07-17 14:43:58.691704070 +0200
++++ udev-114/etc/udev/redhat/40-redhat.rules	2007-08-10 16:27:01.000000000 +0200
+@@ -0,0 +1,27 @@
++# do not edit this file, it will be overwritten on update
 +
- # fix floppy devices
- KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
--KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
++KERNEL=="hd*[!0-9]", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove"
++KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", SYMLINK+="floppy-%k", OPTIONS+="ignore_remove"
 +
-+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", \
-+	RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
-+
- KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
- 
--BUS=="usb", KERNEL=="sd*", SYSFS{bInterfaceClass}=="08", SYSFS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", SYMLINK+="floppy floppy-%k"
-+BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", \
-+	ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", \
-+	SYMLINK+="floppy floppy-%k"
- 
- # audio devices
- KERNEL=="dsp*",			MODE="0660"
-@@ -99,8 +105,8 @@
- KERNEL=="usb/lp*",		GROUP="lp", MODE="0660"
- 
- # tape devices
--SUBSYSTEM=="ide", SYSFS{media}=="tape", ACTION=="add", \
--		RUN+="modprobe ide-scsi idescsi_nocd=1"
-+SUBSYSTEM=="ide", ATTRS{media}=="tape", ACTION=="add", \
-+		RUN+="/sbin/modprobe ide-scsi idescsi_nocd=1"
- KERNEL=="ht*",			GROUP="disk", MODE="0660"
- KERNEL=="nht*",			GROUP="disk", MODE="0660"
- KERNEL=="pt[0-9]*",		GROUP="disk", MODE="0660"
-@@ -155,7 +161,8 @@
- 
- # DVB
- KERNEL=="dvb",			MODE="0660"
--SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
-+SUBSYSTEM=="dvb", \
-+	PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
- 	NAME="%c", MODE="0660"
- 
- KERNEL=="dm-[0-9]*", ACTION=="add",           OPTIONS+="ignore_device"
-@@ -181,6 +188,8 @@
- KERNEL=="dv1394*",      	NAME="dv1394/%n"
- KERNEL=="video1394*",   	NAME="video1394/%n"
- 
 +KERNEL=="fw*", PROGRAM="fw_unit_symlinks.sh %k %n", SYMLINK+="$result"
 +
- KERNEL=="raw[0-9]*",		NAME="raw/%k"
- 
- KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
-@@ -227,89 +236,51 @@
- 
- KERNEL=="pktcdvd", NAME="%k/control"
- 
--
- KERNEL=="hd*[!0-9]", ATTR{removable}=="1", \
- 	ATTR{media}=="floppy", \
- 	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
--KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", SYMLINK+="floppy-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", \
-+	SYMLINK+="floppy-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
-+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", \
-+	SYMLINK+="cdrom cdrom-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
-+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
-+	PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", \
-+	SYMLINK+="dvd dvd-%k"
++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}=="8", SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
++
++ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
 +
-+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
-+	PROGRAM=="check-cdrom.sh %k CD-R", \
-+	SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
++BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", 	SYMLINK+="floppy floppy-%k"
 +
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", \
-+	SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
++KERNEL=="fd[0-9]*",		SYMLINK+="floppy floppy-%k"
 +
-+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
-+	PROGRAM="check-cdrom.sh %k DVD-R", \
-+	SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", \
-+	SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
- 
- # rename sr* to scd*
- KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
- KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \
- 	OPTIONS+="ignore_remove"
- 
--
--
--#######################################
--# Persistent block device stuff - begin
--#######################################
--# persistent disk links: /dev/disk/{by-id,by-uuid,by-label,by-path}
--# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
--
--ACTION!="add", GOTO="persistent_end"
--SUBSYSTEM!="block", GOTO="persistent_end"
--
--# skip rules for inappropriate block devices
--KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", GOTO="persistent_end"
--
--# never access removable ide devices, the drivers are causing event loops on open()
--KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_end"
--KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
--
--# by-id (hardware serial number)
--KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode"
--KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
--KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
--
--KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
--KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
--KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
--KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
--KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
--
--# for partitions import parent information
--KERNEL=="sd*[0-9]|dasd*[0-9]", IMPORT{parent}=="ID_*"
--KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
--
--# by-path (shortest physical path)
--KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
--KERNEL=="sr*", GOTO="persistent_end"
--KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
--KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
--
--# by-label/by-uuid (filesystem properties)
--KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
--IMPORT{program}="/lib/udev/vol_id --export $tempnode"
--ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
--ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
--
--# BIOS Enhanced Disk Device
--KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
--KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
--KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
--
--LABEL="persistent_end"
--
--#####################################
--# Persistent block device stuff - end
--#####################################
--
-+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
-+	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
- 
- ACTION=="add", SUBSYSTEM=="usb_device", \
- 	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
- 	NAME="%c", MODE="0644"
- 
-+ACTION=="add", SUBSYSTEM=="usb_endpoint", \
-+	ATTR{bEndpointAddress}=="?*", ATTRS{devnum}=="?*", ATTRS{busnum}=="?*", \
-+	NAME="bus/usb/$attr{busnum}/$attr{devnum}_ep/$attr{bEndpointAddress}", \
-+	MODE="0644", SYMLINK+="%k"
- 
- # sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
- # sr:           4 TYPE_WORM, 5 TYPE_ROM
-@@ -321,11 +292,11 @@
- 	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
- 
- 
--ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="modprobe sg"
-+ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
- ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \
--	RUN+="modprobe sd_mod"
-+	RUN+="/sbin/modprobe sd_mod"
- ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \
--	RUN+="modprobe sr_mod"
-+	RUN+="/sbin/modprobe sr_mod"
- 
- ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
- 	SYMLINK+="scanner scanner-%k", MODE="0660"
-@@ -333,15 +304,18 @@
- ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \
- 	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
- 
--ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
--	ATTRS{model}!="ADR*", RUN+="modprobe osst"
--ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
--	ATTRS{model}=="ADR*", RUN+="modprobe st"
--ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \
--	RUN+="modprobe st"
-+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", \
-+	ATTRS{vendor}=="On[sS]tream", \
-+	ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst"
-+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", \
-+	ATTRS{vendor}=="On[sS]tream", \
-+	ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st"
-+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", \
-+	ATTRS{vendor}!="On[sS]tream", \
-+	RUN+="/sbin/modprobe st"
- 
- # mmc block devices
--ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
-+ACTION=="add", SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
- 
- 
- RUN+="socket:/org/kernel/udev/monitor"
---- udev-113/etc/udev/redhat/05-udev-early.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/etc/udev/redhat/05-udev-early.rules	2007-07-27 18:42:09.000000000 +0200
-@@ -1,19 +0,0 @@
--# sysfs is populated after the event is sent
--ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
--# ignore these events until someone needs them
--SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
--SUBSYSTEM=="module",		OPTIONS="ignore_device"
--
--
--ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", GOTO="skip_wait"
--
--# pnp devices
--ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
--
--ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
--
--ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
--
--LABEL="skip_wait"
--
--ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
---- udev-113/etc/udev/redhat/06-udev-rh-early.rules.rhrules	2007-07-27 18:31:33.000000000 +0200
-+++ udev-113/etc/udev/redhat/06-udev-rh-early.rules	2007-07-27 18:31:17.000000000 +0200
-@@ -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"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \
++        RUN+="/sbin/modprobe sd_mod"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \
++        RUN+="/sbin/modprobe sr_mod"
 +
-+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-+# pnp devices
-+ACTION=="add", SUBSYSTEM=="pnp", ATTR{id}=="?*", RUN+="/sbin/modprobe pnp:d$attr{id}"
-+ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
++KERNEL=="vcs",                 OWNER="vcsa", GROUP="tty"
++KERNEL=="vcs[0-9]*",           OWNER="vcsa", GROUP="tty"
++KERNEL=="vcsa",                OWNER="vcsa", GROUP="tty"
++KERNEL=="vcsa[0-9]*",          OWNER="vcsa", GROUP="tty"
++KERNEL=="vcc/*",               OWNER="vcsa", GROUP="tty"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- udev.spec	30 Jul 2007 16:24:32 -0000	1.212
+++ udev.spec	10 Aug 2007 14:37:15 -0000	1.213
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 113
-Release: 8%{?dist}
+Version: 114
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -15,15 +15,13 @@
 
 Source1: start_udev
 Source2: udev.nodes
+Source3: udev-post.init
 Source4: fw_unit_symlinks.sh
-Source10: firmware_helper.c
 
-Patch1: udev-permconv.patch
-Patch2: udev-rules.patch
-Patch5: udev-extras.patch
+Patch1: udev-rules.patch
+Patch3: udev-114+git-fcfeda.patch
 Patch7: udev-089-nopie.patch
 Patch9: udev-091-lib64.patch
-Patch14: udev-095-dbgwait.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -71,14 +69,12 @@
 
 %prep
 %setup -q  
-%patch1 -p1 -b .rhpermconv
-%patch2 -p1 -b .rhrules
-%patch5 -p1 -b .rhextras
+%patch1 -p1 -b .rhrules
+%patch3 -p1 -b .git
 %patch7 -p1 -b .nopie
 %patch9 -p1 -b .lib64
-%patch14 -p1 -b .dbgwait
 
-rm -f etc/udev/redhat/51-hotplug.rules
+rm -f etc/udev/redhat/51-hotplug.rules etc/udev/redhat/50* etc/udev/redhat/06*
 %build
 
 %if %{with_static}
@@ -98,6 +94,7 @@
 	extras/usb_id \
 	extras/edd_id \
 	extras/volume_id \
+	extras/cdrom_id \
 	extras/floppy \
 	" all
 
@@ -106,6 +103,7 @@
 	extras/ata_id/ata_id \
 	extras/edd_id/edd_id \
 	extras/usb_id/usb_id \
+	extras/cdrom_id/cdrom_id \
 	extras/volume_id/vol_id \
 	extras/floppy/create_floppy_devices \
 	; do
@@ -131,11 +129,12 @@
 	extras/edd_id \
 	extras/path_id \
 	extras/volume_id \
+	extras/cdrom_id \
 	extras/floppy \
+	extras/rule_generator \
+	extras/firmware \
 	" all
 
-%{__cc} %{optflags} -fpie -pie -o firmware_helper %{SOURCE10}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,7 +150,10 @@
 	extras/edd_id \
 	extras/path_id \
 	extras/volume_id \
+	extras/cdrom_id \
 	extras/floppy \
+	extras/rule_generator \
+	extras/firmware \
 	" install
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
@@ -184,10 +186,15 @@
 %endif
 
 for i in \
-	etc/udev/redhat/06-udev-rh-early.rules \
-	etc/udev/redhat/50-udev.rules \
-	etc/udev/redhat/95-pam-console.rules \
+	etc/udev/redhat/*.rules \
 	etc/udev/rules.d/*.rules \
+	etc/udev/suse/64-device-mapper.rules \
+        etc/udev/suse/64-md-raid.rules \
+	etc/udev/packages/40-alsa.rules \
+	etc/udev/packages/40-ppc.rules \
+	etc/udev/packages/40-s390.rules \
+	etc/udev/packages/40-zaptel.rules \
+	etc/udev/packages/64-device-mapper.rules \
 	; do
 	install -m 0644 "$i"  "$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/${i##*/}"
 done
@@ -196,16 +203,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
 
-for i in load_floppy_module.sh check-cdrom.sh udevpermconv.sh; do
-	install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir}
-done
-
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
 install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}/fw_unit_symlinks.sh
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
 install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
-install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
 #install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
@@ -217,6 +219,8 @@
 exec /sbin/modprobe -a nvram floppy >/dev/null 2>&1 &
 EOF
 
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/udev-post
 
 %preun
 if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
@@ -228,6 +232,7 @@
 	fi
 	/sbin/chkconfig --del udev
 fi
+/sbin/chkconfig --del udev-post
 exit 0
 
 %post
@@ -238,6 +243,7 @@
 		/sbin/udevd -d
 	fi
 fi
+chkconfig --add udev-post
 exit 0
 
 %triggerpostun -- dev <= 0:3.12-1
@@ -275,13 +281,15 @@
 %attr(0755,root,root) %{udev_scriptdir}/edd_id
 %attr(0755,root,root) %{udev_scriptdir}/usb_id
 %attr(0755,root,root) %{udev_scriptdir}/vol_id
+%attr(0755,root,root) %{udev_scriptdir}/cdrom_id
 %attr(0755,root,root) %{udev_scriptdir}/path_id
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
-%attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh
-%attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
-%attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
 %attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
-%attr(0755,root,root) /sbin/firmware_helper
+%attr(0755,root,root) %{udev_scriptdir}/firmware.sh
+%attr(0755,root,root) %{udev_scriptdir}/rule_generator.functions
+%attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
+%attr(0755,root,root) %{udev_scriptdir}/write_net_rules
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
 %attr(0755,root,root) %{_sbindir}/udevmonitor
@@ -308,6 +316,7 @@
 %attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/path_id*.8*
+%attr(0644,root,root) %{_mandir}/man8/cdrom_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8*
 
 # Deprecated, but keep the ownership
@@ -342,6 +351,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Aug 10 2007 Harald Hoyer <harald at redhat.com> - 114-1
+- version 114
+- big rule unification and cleanup
+- added persistent names for network and cdrom devices over reboot
+
 * Mon Jul 30 2007 Harald Hoyer <harald at redhat.com> - 113-8
 - removed "noreplace" config tag from rules (#250043)
 


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/upstream,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upstream	23 Jan 2007 14:53:25 -0000	1.7
+++ upstream	10 Aug 2007 14:37:15 -0000	1.8
@@ -1,2 +1 @@
-udev-094.tar.bz2
-udev-104.tar.bz2
+udev-114.tar.bz2


--- firmware_helper.c DELETED ---


--- udev-095-dbgwait.patch DELETED ---


--- udev-extras.patch DELETED ---


--- udev-permconv.patch DELETED ---




More information about the fedora-extras-commits mailing list