rpms/udev/devel start_udev,1.84,1.85 udev.spec,1.289,1.290

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20059

Modified Files:
	start_udev udev.spec 
Log Message:
* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 145-6
- ifnarch s390 for usbutils

* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-5
- do not make extra nodes in parallel
- restorecon on /dev



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- start_udev	14 Jul 2009 10:32:54 -0000	1.84
+++ start_udev	24 Aug 2009 13:03:46 -0000	1.85
@@ -119,7 +119,9 @@ make_extra_nodes () {
 	[ -c /dev/fuse ] || /bin/mknod -m 0666 /dev/fuse c 10 229
 	#/bin/chown root:root /dev/fuse
 
-	[ -x /sbin/restorecon ] && /sbin/restorecon /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/net/tun /dev/ppp /dev/lp0 /dev/lp1 /dev/lp2 /dev/lp3 /dev/fuse
+	if [ -x /sbin/restorecon ]; then
+		/sbin/restorecon -R /dev
+	fi
 
 	if [ -x "$MAKEDEV" ]; then
 		for i in /etc/udev/makedev.d/*.nodes; do
@@ -139,7 +141,7 @@ make_extra_nodes () {
 							xargs_simple -n 100 $MAKEDEV -x -a -S ) \
 							> "$md5file"
 					fi
-					. "$md5file" >/dev/null 2>&1
+					. "$md5file" >$udev_root/null 2>&1
 				else
 						( sed -e 's,#.*,,g' "$i" | \
 							xargs_simple -n 100 $MAKEDEV -x )
@@ -245,7 +247,7 @@ LANG=C awk "\$2 == \"${udev_root%/}\" &&
 	ret=$[$ret + $?]
 }
 
-make_extra_nodes &
+make_extra_nodes 
 cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
 rm -fr $udev_root/.udev > "$udev_root/null" 2>&1
@@ -272,13 +274,13 @@ if [ -f "/sys/class/tty/console/uevent" 
 	udevtimeout=$(getval udevtimeout $cmdline)
 
 	if strstr "$cmdline" udevdebug; then
-		/sbin/udevadm control --log_priority=debug
+		/sbin/udevadm control --log-priority=debug
 	fi
 	if strstr "$cmdline" udevinfo; then
-		/sbin/udevadm control --log_priority=info
+		/sbin/udevadm control --log-priority=info
 	fi
 	if strstr "$cmdline" udevchilds; then
-		/sbin/udevadm control --max_childs_running=$(getval udevchilds $cmdline)
+		/sbin/udevadm control --max-childs=$(getval udevchilds $cmdline)
 	fi
 
         /sbin/udevadm control --env=STARTUP=1


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- udev.spec	4 Aug 2009 09:16:53 -0000	1.289
+++ udev.spec	24 Aug 2009 13:03:47 -0000	1.290
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -38,9 +38,10 @@ BuildRequires: libxslt
 BuildRequires: hwdata
 BuildRequires: gobject-introspection-devel >= 0.6.2
 BuildRequires: gtk-doc
+%ifnarch s390 s390x
 BuildRequires: usbutils >= 0.82
+%endif
 BuildRequires: libtool >= 2.2.6
-
 Requires: libselinux >= 0:1.17.9-2 sed 
 Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
 Requires: util-linux-ng >= 2.15.1
@@ -351,6 +352,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 145-6
+- ifnarch s390 for usbutils
+
+* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-5
+- do not make extra nodes in parallel
+- restorecon on /dev
+
 * Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-4
 - --enable-debug 
 - add patch for timestamps in debugging output