[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/udev/devel udev-078-nodberr.patch, NONE, 1.1 udev-078-redhat.patch, 1.3, 1.4 udev.spec, 1.138, 1.139



Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1382

Modified Files:
	udev-078-redhat.patch udev.spec 
Added Files:
	udev-078-nodberr.patch 
Log Message:
- added some WAIT_FOR_SYSFS rules
- removed warning message, if udev_db is not available


udev-078-nodberr.patch:
 udev_db.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE udev-078-nodberr.patch ---
--- udev-078/udev_db.c.nodberr	2006-01-23 11:28:12.000000000 +0100
+++ udev-078/udev_db.c	2006-01-23 11:28:38.000000000 +0100
@@ -212,7 +212,7 @@
 	strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
 	dir = opendir(dbpath);
 	if (dir == NULL) {
-		err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
+		/*err("unable to open udev_db '%s': %s", dbpath, strerror(errno)); */
 		return -1;
 	}
 
@@ -283,7 +283,7 @@
 	strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
 	dir = opendir(dbpath);
 	if (dir == NULL) {
-		err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
+		/* err("unable to open udev_db '%s': %s", dbpath, strerror(errno)); */
 		return -1;
 	}
 

udev-078-redhat.patch:
 etc/udev/redhat/hotplug.rules                      |   13 ++
 etc/udev/redhat/udev.rules                         |  103 ++++++++++++---------
 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 +++++++++++++++++++
 9 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-078-redhat.patch	11 Jan 2006 12:11:24 -0000	1.3
+++ udev-078-redhat.patch	23 Jan 2006 10:38:21 -0000	1.4
@@ -1,6 +1,6 @@
 --- 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-11 12:53:26.000000000 +0100
-@@ -3,6 +3,11 @@
++++ udev-078/etc/udev/redhat/udev.rules	2006-01-23 11:29:30.000000000 +0100
+@@ -3,6 +3,15 @@
  #
  # default is OWNER="root" GROUP="root", MODE="0600"
  #
@@ -9,10 +9,14 @@
 +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 +15,44 @@
+@@ -10,40 +19,44 @@
  KERNEL=="root",			GROUP="disk", MODE="0640"
  
  # console devices
@@ -83,7 +87,7 @@
  
  # memory devices
  KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
-@@ -54,6 +63,8 @@
+@@ -54,6 +67,8 @@
  KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
  KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
  KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
@@ -92,18 +96,18 @@
  
  # misc devices
  KERNEL=="nvram",		MODE="0660"
-@@ -61,6 +72,10 @@
+@@ -61,6 +76,10 @@
  
  # 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", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
-+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/rm -f $root/%k*"
++KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
  
  # audio devices
  KERNEL=="dsp*",			MODE="0660"
-@@ -209,7 +224,7 @@
+@@ -209,7 +228,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"
@@ -112,7 +116,7 @@
  
  KERNEL=="umad*", 		NAME="infiniband/%k"
  KERNEL=="issm*", 		NAME="infiniband/%k"
-@@ -224,24 +239,25 @@
+@@ -224,24 +243,25 @@
  BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
  
  # do not seperate the next 2 lines!!
@@ -146,7 +150,7 @@
  
  #######################################
  # Persistent block device stuff - begin
-@@ -301,19 +317,11 @@
+@@ -301,19 +321,11 @@
  
  
  # Perhaps this should just be for all subsystems?
@@ -167,15 +171,36 @@
  ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
  	RUN+="/sbin/modprobe sd_mod"
  ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
-@@ -331,3 +339,6 @@
+@@ -331,3 +343,6 @@
  
  ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
          RUN+="/sbin/firmware_helper"
 +
 +RUN+="socket:/org/kernel/udev/monitor"
 +
---- /dev/null	2006-01-06 12:23:50.344776400 +0100
-+++ udev-078/extras/ide-media.sh	2006-01-11 12:53:26.000000000 +0100
+--- 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 @@
+ # do not call hotplug.d and dev.d for "drivers" and "module" events
+-SUBSYSTEM=="drivers",	OPTIONS="last_rule"
+-SUBSYSTEM=="module",	OPTIONS="last_rule"
++SUBSYSTEM=="drivers",   GOTO="hotplug_end"
++SUBSYSTEM=="module",    GOTO="hotplug_end"
++ACTION="add",           GOTO="hotplug_comp"
++ACTION="remove",        GOTO="hotplug_comp"
+ 
++GOTO="hotplug_end"
++
++LABEL="hotplug_comp"
+ # compatibility support for the obsolete hotplug.d and dev.d directories
+-ENV{UDEVD_EVENT}=="1",	RUN+="/lib/udev/udev_run_hotplugd"
++ENV{UDEVD_EVENT}=="1",  RUN+="/lib/udev/udev_run_hotplugd"
+ RUN+="/lib/udev/udev_run_devd"
+ 
++
++LABEL="hotplug_end"
+--- /dev/null	2006-01-20 06:37:43.888693712 +0100
++++ udev-078/extras/ide-media.sh	2006-01-23 11:21:53.000000000 +0100
 @@ -0,0 +1,7 @@
 +#!/bin/bash 
 +i=0
@@ -184,8 +209,8 @@
 +	i=$[i+1];
 +done
 +/bin/cat /proc/ide/$1/media
---- /dev/null	2006-01-06 12:23:50.344776400 +0100
-+++ udev-078/extras/run_directory/MAKEDEV.dev	2006-01-11 12:53:26.000000000 +0100
+--- /dev/null	2006-01-20 06:37:43.888693712 +0100
++++ udev-078/extras/run_directory/MAKEDEV.dev	2006-01-23 11:21:53.000000000 +0100
 @@ -0,0 +1,38 @@
 +#!/bin/sh
 +
@@ -226,7 +251,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	2006-01-11 12:53:26.000000000 +0100
++++ udev-078/extras/run_directory/dev.d/default/pam_console.dev	2006-01-23 11:21:53.000000000 +0100
 @@ -1,16 +1,11 @@
  #!/bin/sh
  
@@ -268,8 +293,8 @@
 +	debug_mesg "Restoring console permissions for $DEVNAME $DEVLINKS"
 +	/sbin/pam_console_apply "$DEVNAME" $DEVLINKS
  fi
---- /dev/null	2006-01-06 12:23:50.344776400 +0100
-+++ udev-078/extras/check-cdrom.sh	2006-01-11 12:53:26.000000000 +0100
+--- /dev/null	2006-01-20 06:37:43.888693712 +0100
++++ udev-078/extras/check-cdrom.sh	2006-01-23 11:21:53.000000000 +0100
 @@ -0,0 +1,39 @@
 +#!/bin/bash
 +
@@ -310,8 +335,8 @@
 +    done
 +    exit 1
 +}
---- /dev/null	2006-01-06 12:23:50.344776400 +0100
-+++ udev-078/extras/udevpermconv.sh	2006-01-11 12:53:26.000000000 +0100
+--- /dev/null	2006-01-20 06:37:43.888693712 +0100
++++ udev-078/extras/udevpermconv.sh	2006-01-23 11:21:53.000000000 +0100
 @@ -0,0 +1,94 @@
 +#!/bin/bash
 +#
@@ -407,8 +432,8 @@
 +
 +processInput
 +exit 0
---- /dev/null	2006-01-06 12:23:50.344776400 +0100
-+++ udev-078/extras/load_floppy_module.sh	2006-01-11 12:53:26.000000000 +0100
+--- /dev/null	2006-01-20 06:37:43.888693712 +0100
++++ udev-078/extras/load_floppy_module.sh	2006-01-23 11:21:53.000000000 +0100
 @@ -0,0 +1,35 @@
 +#!/bin/sh
 +########################################################################
@@ -445,8 +470,8 @@
 +fi
 +
 +exit $?
---- udev-078/extras/floppy/create_floppy_devices.c.redhat	2006-01-11 12:53:29.000000000 +0100
-+++ udev-078/extras/floppy/create_floppy_devices.c	2006-01-11 12:53:11.000000000 +0100
+--- udev-078/extras/floppy/create_floppy_devices.c.redhat	2005-12-17 16:40:29.000000000 +0100
++++ udev-078/extras/floppy/create_floppy_devices.c	2006-01-23 11:21:53.000000000 +0100
 @@ -116,8 +116,12 @@
  		minor = (table_sup[type][i] << 2) + fdnum;
  		if (print_nodes)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- udev.spec	22 Jan 2006 18:47:58 -0000	1.138
+++ udev.spec	23 Jan 2006 10:38:21 -0000	1.139
@@ -21,6 +21,7 @@
 Patch2: udevstart2.patch
 Patch3: udev-075-selinux.patch
 Patch4: udev-078-udevstart-greylist.patch
+Patch5: udev-078-nodberr.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -44,6 +45,7 @@
 %patch2 -p1 -b .udevstart2
 %patch3 -p1 -b .selinux
 %patch4 -p1 -b .greylist
+%patch5 -p1 -b .nodberr
 
 %build
 
@@ -188,6 +190,7 @@
 if [ "$1" -ge "1" -a  -x /sbin/pidof ]; then
 	pid=`/sbin/pidof -x udevd`
 	[ -n "$pid" ] && kill $pid
+	/sbin/udevd -d
 fi
 exit 0
 
@@ -277,6 +280,10 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Mon Jan 23 2006 Harald Hoyer <harald redhat com> - 078-5
+- added some WAIT_FOR_SYSFS rules
+- removed warning message, if udev_db is not available
+
 * Sun Jan 22 2006 Kristian Høgsberg <krh redhat com> 078-5
 - Drop udev dependency (#178621).
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]