rpms/udev/F-12 start_udev,1.85,1.86 udev.spec,1.293,1.294

[Harald Hoyer]

Author: harald

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

Modified Files:
	start_udev udev.spec 
Log Message:
* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-10
- recognize a devtmpfs on /dev



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/start_udev,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- start_udev	24 Aug 2009 13:03:46 -0000	1.85
+++ start_udev	13 Oct 2009 10:35:52 -0000	1.86
@@ -223,7 +223,7 @@ STRING=$"Starting $prog: "
 echo -n "$STRING"
 
 # mount the tmpfs on ${udev_root%/}, if not already done
-LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+LANG=C awk "\$2 == \"${udev_root%/}\" && ( \$3 == \"devtmpfs\" || \$3 == \"tmpfs\" ) { exit 1 }" /proc/mounts && {
 	if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then
 		PTSDIR=$(mktemp -d)
 		mount --move $udev_root/pts "$PTSDIR"
@@ -232,7 +232,9 @@ LANG=C awk "\$2 == \"${udev_root%/}\" &&
 		SHMDIR=$(mktemp -d)
 		mount --move $udev_root/shm "$SHMDIR"
 	fi
-	mount -n -o mode=0755 -t tmpfs none "$udev_root"
+	# First try to mount a devtmpfs on $udev_root
+	mount -n -o mode=0755 -t devtmpfs none "$udev_root" 2>/dev/null \
+	|| mount -n -o mode=0755 -t tmpfs none "$udev_root" 
 	mkdir -m 0755 $udev_root/pts
 	mkdir -m 0755 $udev_root/shm
 	if [ -n "$PTSDIR" ]; then


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- udev.spec	25 Sep 2009 17:05:23 -0000	1.293
+++ udev.spec	13 Oct 2009 10:35:52 -0000	1.294
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -357,6 +357,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-10
+- recognize a devtmpfs on /dev
+
 * Fri Sep 25 2009 harald at redhat.com 145-9
 - add patches to fix cdrom_id
 - add patch to fix the inotify bug (bug #524752)