rpms/udev/devel start_udev, 1.63, 1.64 udev-rules.patch, 1.40, 1.41 udev.spec, 1.210, 1.211 modprobe_helper.c, 1.1, NONE

Harald Hoyer (harald) fedora-extras-commits at redhat.com
Fri Jul 27 16:52:13 UTC 2007


Author: harald

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

Modified Files:
	start_udev udev-rules.patch udev.spec 
Removed Files:
	modprobe_helper.c 
Log Message:
- major rule cleanup
- removed persistent rules from 50 and included upstream rules
- removed skip_wait from modprobe



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- start_udev	14 Jul 2007 10:12:48 -0000	1.63
+++ start_udev	27 Jul 2007 16:51:38 -0000	1.64
@@ -197,38 +197,15 @@
         if strstr "$cmdline" fastudev; then
 		/sbin/udevcontrol env FASTUDEV=1
         fi
-	if strstr "$cmdline" mcollect; then
-		/sbin/udevcontrol env MODPROBE_COLLECT=1
-		MODPROBE_COLLECT=1
-	fi
 	if strstr "$cmdline" udevchilds; then
 		/sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline)
 	fi
 
-	rm -f /dev/MODPROBE
         /sbin/udevcontrol env STARTUP=1
 	/sbin/udevtrigger
 	ret=$[$ret + $?]
 	wait_for_queue $(getval udevtimeout $cmdline)
 	ret=$[$ret + $?]
-
-        if [ -e "$MODPROBE_COLLECT" ]; then
-		/sbin/udevcontrol env MODPROBE_COLLECT=
-		unset MODPROBE_COLLECT
-		wait_for_queue $(getval udevtimeout $cmdline)
-		ret=$[$ret + $?]
-	fi
-
-	if [ -e /dev/MODPROBE ]; then 
-	        [ $ret -eq 0 ] && success $"$STRING" || failure $"$STRING"
-		echo
-		ret=0
-		echo -n $"Loading kernel modules: "		
-		(xargs_simple /sbin/modprobe -a) < /dev/MODPROBE 2>/dev/null &
-		rm -f /dev/MODPROBE
-		wait_for_queue $(getval udevtimeout $cmdline)
-		ret=$[$ret + $?]
-	fi
 	wait
 	/sbin/udevcontrol env STARTUP=
 	/sbin/udevcontrol env MODPROBE_DEBUG=

udev-rules.patch:

Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- udev-rules.patch	20 Jul 2007 12:58:24 -0000	1.40
+++ udev-rules.patch	27 Jul 2007 16:51:38 -0000	1.41
@@ -1,6 +1,6 @@
 --- 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-20 14:55:37.000000000 +0200
-@@ -4,7 +4,7 @@
++++ 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"
  #
  
@@ -9,16 +9,89 @@
  
  # all block devices
  SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
-@@ -72,7 +72,7 @@
- KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
+ 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"
++
+ # 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=="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"
++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 +99,8 @@
+@@ -99,8 +105,8 @@
  KERNEL=="usb/lp*",		GROUP="lp", MODE="0660"
  
  # tape devices
@@ -29,7 +102,17 @@
  KERNEL=="ht*",			GROUP="disk", MODE="0660"
  KERNEL=="nht*",			GROUP="disk", MODE="0660"
  KERNEL=="pt[0-9]*",		GROUP="disk", MODE="0660"
-@@ -181,6 +181,8 @@
+@@ -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"
  
@@ -38,15 +121,115 @@
  KERNEL=="raw[0-9]*",		NAME="raw/%k"
  
  KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
-@@ -306,10 +308,13 @@
- #####################################
+@@ -227,89 +236,51 @@
  
+ KERNEL=="pktcdvd", NAME="%k/control"
  
--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", ATTR{devnum}=="?*", ATTR{busnum}=="?*", \
-+	NAME="bus/usb/$attr{busnum}/$attr{devnum}", MODE="0644"
+-
+ 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"
++
++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-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}=="?*", \
@@ -55,7 +238,7 @@
  
  # sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
  # sr:           4 TYPE_WORM, 5 TYPE_ROM
-@@ -321,11 +326,11 @@
+@@ -321,11 +292,11 @@
  	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
  
  
@@ -70,17 +253,24 @@
  
  ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
  	SYMLINK+="scanner scanner-%k", MODE="0660"
-@@ -334,14 +339,14 @@
+@@ -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", \
+-ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
 -	ATTRS{model}!="ADR*", RUN+="modprobe osst"
-+	ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst"
- ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+-ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
 -	ATTRS{model}=="ADR*", RUN+="modprobe st"
-+	ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st"
- ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \
+-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
@@ -90,22 +280,35 @@
  
  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-19 18:43:06.000000000 +0200
-@@ -5,14 +5,14 @@
- SUBSYSTEM=="module",		OPTIONS="ignore_device"
- 
- 
++++ 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"
-+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe_helper $env{MODALIAS}", GOTO="skip_wait"
- 
- # pnp devices
+-
+-# 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=="pnp", ATTR{id}=="?*", RUN+="modprobe_helper pnp:d$attr{id}"
- 
- ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
- 
+-
+-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+-
 -ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-+KERNEL=="[0-9]*:[0-9]*", ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
- 
- LABEL="skip_wait"
- 
+-
+-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=="?*", 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"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- udev.spec	20 Jul 2007 12:58:24 -0000	1.210
+++ udev.spec	27 Jul 2007 16:51:38 -0000	1.211
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 113
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -15,7 +15,6 @@
 
 Source1: start_udev
 Source2: udev.nodes
-Source3: modprobe_helper.c
 Source4: fw_unit_symlinks.sh
 Source10: firmware_helper.c
 
@@ -136,7 +135,6 @@
 	" all
 
 %{__cc} %{optflags} -fpie -pie -o firmware_helper %{SOURCE10}
-%{__cc} %{optflags} -fpie -pie -o modprobe_helper %{SOURCE3}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -185,10 +183,15 @@
 done
 %endif
 
-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/50-udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
-install -m 0644 etc/udev/redhat/95-pam-console.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/95-pam-console.rules
-
+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/rules.d/*.rules \
+	; do
+	install -m 0644 "$i"  "$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/${i##*/}"
+done
+	
 install -m 0644 etc/udev/udev.conf $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 
 mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
@@ -203,7 +206,6 @@
 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 modprobe_helper $RPM_BUILD_ROOT%{udev_scriptdir}/modprobe_helper
 #install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
@@ -275,7 +277,6 @@
 %attr(0755,root,root) %{udev_scriptdir}/vol_id
 %attr(0755,root,root) %{udev_scriptdir}/path_id
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
-%attr(0755,root,root) %{udev_scriptdir}/modprobe_helper
 %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
@@ -291,9 +292,7 @@
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
 
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/05-udev-early.rules
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/95-pam-console.rules
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/*.rules
 %config(noreplace) %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
 
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
@@ -343,6 +342,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Jul 27 2007 Harald Hoyer <harald at redhat.com> - 113-7
+- major rule cleanup
+- removed persistent rules from 50 and included upstream rules
+- removed skip_wait from modprobe
+
 * Fri Jul 20 2007 Harald Hoyer <harald at redhat.com> - 113-6
 - kernel does not provide usb_device anymore,
   corrected the rules (#248916)


--- modprobe_helper.c DELETED ---




More information about the fedora-extras-commits mailing list