rpms/udev/devel start_udev, 1.70, 1.71 udev.spec, 1.238, 1.239 udev.sysconfig, 1.1, 1.2

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	start_udev udev.spec udev.sysconfig 
Log Message:
* Fri Mar 14 2008 Harald Hoyer <harald at redhat.com> 118-10
- turned off MAKEDEV cache, until the generated shell scripts 
  create new directories



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- start_udev	13 Mar 2008 16:45:35 -0000	1.70
+++ start_udev	14 Mar 2008 22:37:47 -0000	1.71
@@ -44,6 +44,20 @@
 udevd=/sbin/udevd
 MAKEDEV="/sbin/MAKEDEV"
 
+# Check SELinux status
+selinuxfs="$(fstab_decode_str `LC_ALL=C awk '/ selinuxfs / { print $2 }' /proc/mounts`)"
+SELINUX_STATE=
+if [ -n "$selinuxfs" ] && [ "`cat /proc/self/attr/current`" != "kernel" ]; then
+        if [ -r "$selinuxfs/enforce" ] ; then
+                SELINUX_STATE=`cat "$selinuxfs/enforce"`
+        else
+                # assume enforcing if you can't read it
+                SELINUX_STATE=1
+        fi
+fi
+
+
+
 xargs_simple () {
 	if [ "$1" = "-n" ]; then
 		shift
@@ -85,12 +99,16 @@
 	[ -d /dev/.udev/makedev.d ] || mkdir -p /dev/.udev/makedev.d
 	USE_MD5="false"
 	[ -x /usr/bin/md5sum -a "$UDEV_USE_MAKEDEV_CACHE" == "yes" ] && USE_MD5="true"
+
+
 	if [ -x "$MAKEDEV" ]; then
 		for i in /etc/udev/makedev.d/*.nodes; do
 			if [ -f "$i" ]; then 			   
 				# use a little caching to speedup things
 				if [ "$USE_MD5" == "true" ]; then
-					md5=$(/usr/bin/md5sum "$i"|(read a b; echo $a))
+					# fix for MAKEDEV shell scripts
+					[ -d /dev/net ] || mkdir -p /dev/net 
+					md5=$(/usr/bin/md5sum "$i"|(read a b; echo $a))-se$SELINUX_STATE
 					if [ -f "/var/lib/udev/makedev.d/${md5}.sh" ];then
 						md5file="/var/lib/udev/makedev.d/${md5}.sh"
 					else


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- udev.spec	13 Mar 2008 16:45:35 -0000	1.238
+++ udev.spec	14 Mar 2008 22:37:47 -0000	1.239
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 118
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -412,6 +412,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Mar 14 2008 Harald Hoyer <harald at redhat.com> 118-10
+- turned off MAKEDEV cache, until the generated shell scripts 
+  create new directories
+
 * Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-9
 - added more support for the "modprobedebug" kernel command 
   line option, to debug hanging kernel modules


Index: udev.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev.sysconfig	13 Mar 2008 15:28:17 -0000	1.1
+++ udev.sysconfig	14 Mar 2008 22:37:47 -0000	1.2
@@ -1,7 +1,8 @@
-# generate a cache shell file of what MAKEDEV would do
-# speedup some systems with slow disks
-UDEV_USE_MAKEDEV_CACHE="yes"
+# If set to "yes", generates cache shell files of what MAKEDEV would do.
+# May speedup some systems with slow disks.
+# EXPERIMENTAL - use at your own risk
+UDEV_USE_MAKEDEV_CACHE="no"
 
-# generates /dev/disk/by* symlinks
-# set to "no", if you don't need it and want a speedup at boot time
+# Generates /dev/disk/by* symlinks.
+# Set to "no", if you *really* don't need them and want a speedup at boot time.
 UDEV_PERSISTENT_STORAGE="yes"