rpms/udev/F-11 start_udev,1.82,1.83 udev.spec,1.274,1.275

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16532

Modified Files:
	start_udev udev.spec 
Log Message:
* Tue Jul 14 2009 Harald Hoyer <harald at redhat.com> 141-5
- add /dev/fuse to be created by start_udev
- add "udevlog" kernel command line option to redirect the
  output of udevd to /dev/.udev/udev.log



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/start_udev,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- start_udev	3 Mar 2009 13:11:08 -0000	1.82
+++ start_udev	14 Jul 2009 10:06:45 -0000	1.83
@@ -99,36 +99,27 @@ make_extra_nodes () {
 	USE_MD5="false"
 	[ -x /usr/bin/md5sum -a "$UDEV_USE_MAKEDEV_CACHE" == "yes" ] && USE_MD5="true"
 
+	for i in 0 1 2 3 4 5 6 7; do
+		[ -b /dev/loop$i ] || /bin/mknod -m 0640 /dev/loop$i b 7 $i
+		/bin/chown root:disk /dev/loop$i
+	done
+
+	for i in 0 1 2 3; do
+		[ -c /dev/lp$i ] || /bin/mknod -m 0660 /dev/lp$i c 6 $i
+		/bin/chown root:lp /dev/lp$i
+	done
+
 	[ -d /dev/net ] || mkdir -p /dev/net 
-	/bin/mknod -m 0640 /dev/loop0 b 7 0
-	/bin/chown root:disk /dev/loop0
-	/bin/mknod -m 0640 /dev/loop1 b 7 1
-	/bin/chown root:disk /dev/loop1
-	/bin/mknod -m 0640 /dev/loop2 b 7 2
-	/bin/chown root:disk /dev/loop2
-	/bin/mknod -m 0640 /dev/loop3 b 7 3
-	/bin/chown root:disk /dev/loop3
-	/bin/mknod -m 0640 /dev/loop4 b 7 4
-	/bin/chown root:disk /dev/loop4
-	/bin/mknod -m 0640 /dev/loop5 b 7 5
-	/bin/chown root:disk /dev/loop5
-	/bin/mknod -m 0640 /dev/loop6 b 7 6
-	/bin/chown root:disk /dev/loop6
-	/bin/mknod -m 0640 /dev/loop7 b 7 7
-	/bin/chown root:disk /dev/loop7
-	/bin/mknod -m 0600 /dev/net/tun c 10 200
-	/bin/chown root:root /dev/net/tun
-	/bin/mknod -m 0600 /dev/ppp c 108 0
-	/bin/chown root:root /dev/ppp
-	/bin/mknod -m 0660 /dev/lp0 c 6 0
-	/bin/chown root:lp /dev/lp0
-	/bin/mknod -m 0660 /dev/lp1 c 6 1
-	/bin/chown root:lp /dev/lp1
-	/bin/mknod -m 0660 /dev/lp2 c 6 2
-	/bin/chown root:lp /dev/lp2
-	/bin/mknod -m 0660 /dev/lp3 c 6 3
-	/bin/chown root:lp /dev/lp3
-	[ -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
+	[ -c /dev/net/tun ] || /bin/mknod -m 0600 /dev/net/tun c 10 200
+	#/bin/chown root:root /dev/net/tun
+
+	[ -c /dev/ppp ] || /bin/mknod -m 0600 /dev/ppp c 108 0
+	#/bin/chown root:root /dev/ppp
+
+	[ -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 "$MAKEDEV" ]; then
 		for i in /etc/udev/makedev.d/*.nodes; do
@@ -258,6 +249,7 @@ make_extra_nodes &
 cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
 rm -fr $udev_root/.udev > "$udev_root/null" 2>&1
+mkdir -p $udev_root/.udev > "$udev_root/null" 2>&1
 UDEV_OPTS=""
 if [ -f "/sys/class/tty/console/uevent" ]; then
 	# trigger the sorted events
@@ -266,7 +258,14 @@ if [ -f "/sys/class/tty/console/uevent" 
 	if strstr "$cmdline" udevtrace; then
 		UDEV_OPTS="$UDEV_OPTS --debug-trace"
 	fi
-	/sbin/udevd -d $UDEV_OPTS
+	if strstr "$cmdline" udevlog; then
+		UDEV_OPTS="$UDEV_OPTS --debug"
+		/sbin/udevd -d $UDEV_OPTS 2>$udev_root/.udev/udev.log
+	else
+		/sbin/udevd -d $UDEV_OPTS $UDEV_REDIR
+	fi
+
+
 	wait
 	ret=$[$ret + $?]
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- udev.spec	30 Jun 2009 11:46:28 -0000	1.274
+++ udev.spec	14 Jul 2009 10:06:45 -0000	1.275
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 141
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -408,6 +408,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 14 2009 Harald Hoyer <harald at redhat.com> 141-5
+- add /dev/fuse to be created by start_udev
+- add "udevlog" kernel command line option to redirect the
+  output of udevd to /dev/.udev/udev.log
+
 * Tue Jun 30 2009 Harald Hoyer <harald at redhat.com> 141-4
 - really try to kill udevd in %post (bug #481075)
 - show "isw_raid_member" before "linux_raid_member" with vol_id (bug #499246)