rpms/udev/devel start_udev, 1.71, 1.72 udev-post.init, 1.6, 1.7 udev.spec, 1.239, 1.240

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	start_udev udev-post.init udev.spec 
Log Message:
* Mon Mar 17 2008 Harald Hoyer <harald at redhat.com> 118-11
- removed /var/lib/udev/rules.d again



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- start_udev	14 Mar 2008 22:37:47 -0000	1.71
+++ start_udev	17 Mar 2008 18:09:38 -0000	1.72
@@ -225,13 +225,6 @@
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 
-	mkdir -p /dev/.udev/rules.d/
-	for i in /var/lib/udev/rules.d/*.rules; do
-		if [ -f "$i" ]; then
-			cp "$i" /dev/.udev/rules.d/ >/dev/null 2>&1 
-		fi
-	done
-
 	/sbin/udevd -d
 	ret=$[$ret + $?]
 


Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- udev-post.init	13 Mar 2008 16:45:35 -0000	1.6
+++ udev-post.init	17 Mar 2008 18:09:38 -0000	1.7
@@ -22,6 +22,26 @@
 # See how we were called.
 case "$1" in
   start|reload)
+	STRING=$"Adding udev persistent rules"
+	
+	# copy the rules generated before / was mounted read-write
+	for file in /dev/.udev/tmp-rules--*; do
+		dest=${file##*tmp-rules--}
+		# check, if anything is todo
+		[ "$dest" = '*' ] && exit 0
+		echo -n $STRING 
+		cat $file >> /etc/udev/rules.d/$dest
+		rc=$?
+		rm -f $file
+		if [ "$rc" -eq "0" ]; then
+			success "$STRING"
+			echo
+		elif [ "$rc" -eq "1" ]; then
+			failure "$STRING"
+			echo
+            	fi
+	done
+
 	touch /var/lock/subsys/udev-post
 	exit 0
 	;;
@@ -54,21 +74,6 @@
 			fi
 		done 
 	fi
-	STRING=$"Adding udev persistent rule"
-	for file in /dev/.udev/rules.d/*; do 
-		if [ -f "$i" ]; then
-			echo -n $STRING 
-			cp "$i" /var/lib/udev/rules.d/
-			rc=$?
-			if [ "$rc" -eq "0" ]; then
-				success "$STRING"
-				echo
-			elif [ "$rc" -eq "1" ]; then
-				failure "$STRING"
-				echo
-	            	fi
-		fi
-	done
 	rm -f /var/lock/subsys/udev-post
 	exit 0
 	;;


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- udev.spec	14 Mar 2008 22:37:47 -0000	1.239
+++ udev.spec	17 Mar 2008 18:09:38 -0000	1.240
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 118
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -21,7 +21,6 @@
 
 Patch1: udev-116-nettype.patch
 Patch2: udev-116-rhrules.patch
-Patch3: udev-118-varlib.patch
 Patch4: udev-118-sysconf.patch
 
 Patch100: udev-089-nopie.patch
@@ -76,7 +75,6 @@
 %setup -q  
 %patch1 -p1 -b .nettype
 %patch2 -p1 -b .rhrules
-%patch3 -p1 -b .varlib
 %patch4 -p1 -b .sysconf
 
 %patch100 -p1 -b .nopie
@@ -250,9 +248,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/udev
 
-mkdir -p $RPM_BUILD_ROOT/var/lib/udev/
 mkdir -p $RPM_BUILD_ROOT/var/lib/udev/makedev.d
-mkdir -p $RPM_BUILD_ROOT/var/lib/udev/rules.d
 
 %preun
 if [ "$1" = 0 -a -f %{_initrddir}/udev ]; then
@@ -277,15 +273,6 @@
 	fi
 fi
 
-[ -d /dev/.udev/rules.d ] || mkdir -p /dev/.udev/rules.d/ >/dev/null 2>&1
-for i in 70-persistent-cd.rules 70-persistent-net.rules; do
-	[ -L "/etc/udev/rules.d/$i" ] && continue
-	if [ -f "/etc/udev/rules.d/$i" ]; then 
-		mv /etc/udev/rules.d/$i /var/lib/udev/rules.d  >/dev/null 2>&1
-		cp /var/lib/udev/rules.d/* /dev/.udev/rules.d/ >/dev/null 2>&1
-		ln -s ../../../dev/.udev/rules.d/$i /etc/udev/rules.d/$i  >/dev/null 2>&1
-	fi
-done
 
 if [ "$1" -ge "1" ]; then
 	/sbin/udevd -d
@@ -379,7 +366,6 @@
 
 %dir %attr(0755,root,root) /var/lib/udev
 %dir %attr(0755,root,root) /var/lib/udev/makedev.d
-%dir %attr(0755,root,root) /var/lib/udev/rules.d
 
 # Deprecated, but keep the ownership
 %ghost %dir %{_sysconfdir}/udev/scripts/
@@ -412,6 +398,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Mon Mar 17 2008 Harald Hoyer <harald at redhat.com> 118-11
+- removed /var/lib/udev/rules.d again
+
 * Fri Mar 14 2008 Harald Hoyer <harald at redhat.com> 118-10
 - turned off MAKEDEV cache, until the generated shell scripts 
   create new directories