rpms/udev/devel udev-118-varlib.patch, NONE, 1.1 udev-post.init, 1.3, 1.4 udev.spec, 1.235, 1.236

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	udev-post.init udev.spec 
Added Files:
	udev-118-varlib.patch 
Log Message:
* Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-7
- files from /var/lib/udev/rules.d are copied to /dev/.udev/rules.d 
  at startup and back at shutdown
- persistent cd and net rules generate the files in 
  /dev/.udev/rules.d now
- added post section to symlink 70-persistent-cd.rules 70-persistent-net.rules
  from /etc/udev/rules.d to /dev/.udev/rules.d


udev-118-varlib.patch:

--- NEW FILE udev-118-varlib.patch ---
diff -up udev-118/extras/rule_generator/write_net_rules.varlib udev-118/extras/rule_generator/write_net_rules
--- udev-118/extras/rule_generator/write_net_rules.varlib	2008-03-13 14:28:23.000000000 +0100
+++ udev-118/extras/rule_generator/write_net_rules	2008-03-13 14:32:10.000000000 +0100
@@ -21,7 +21,7 @@
 #   INTERFACE_NAME        requested name supplied by external tool
 #   INTERFACE_NEW         new interface name returned by rule writer
 
-RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+RULES_FILE='/dev/.udev/rules.d/70-persistent-net.rules'
 
 if [ "$MATCHIFTYPE" ]; then
 	[ $[MATCHIFTYPE] -gt 256 ] && return 0
diff -up udev-118/extras/rule_generator/write_cd_rules.varlib udev-118/extras/rule_generator/write_cd_rules
--- udev-118/extras/rule_generator/write_cd_rules.varlib	2008-03-13 14:28:16.000000000 +0100
+++ udev-118/extras/rule_generator/write_cd_rules	2008-03-13 14:32:23.000000000 +0100
@@ -11,7 +11,7 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation version 2 of the License.
 
-RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
+RULES_FILE="/dev/.udev/rules.d/70-persistent-cd.rules"
 
 . /lib/udev/rule_generator.functions
 
diff -up udev-118/extras/rule_generator/rule_generator.functions.varlib udev-118/extras/rule_generator/rule_generator.functions


Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-post.init	13 Mar 2008 13:00:10 -0000	1.3
+++ udev-post.init	13 Mar 2008 14:33:00 -0000	1.4
@@ -21,42 +21,6 @@
 # See how we were called.
 case "$1" in
   start|reload)
-	STRING=$"Adding udev makedev cache file"	
-	# copy the MAKEDEV shell scripts generated before / was mounted read-write
-	for file in /dev/.udev/makedev.d/*; do
-		if [ -f "$file" ]; then
-			echo -n $STRING 
-			cp "$file" /var/lib/udev/makedev.d/ 
-			rc=$?
-			rm -f "$file"
-			if [ "$rc" -eq "0" ]; then
-				success "$STRING"
-				echo
-			elif [ "$rc" -eq "1" ]; then
-				failure "$STRING"
-				echo
-	            	fi
-		fi
-	done
-
-	STRING=$"Adding udev persistent rule"
-	# 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" = '*' ] && break
-		echo -n $STRING 
-		cat $file >> /var/lib/udev/rules.d/$dest && cp /var/lib/udev/rules.d/$dest /dev/.udev/rules.d/
-		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
 	;;
@@ -88,6 +52,21 @@
 			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.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- udev.spec	13 Mar 2008 13:00:10 -0000	1.235
+++ udev.spec	13 Mar 2008 14:33:00 -0000	1.236
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 118
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -20,6 +20,7 @@
 
 Patch1: udev-116-nettype.patch
 Patch2: udev-116-rhrules.patch
+Patch3: udev-118-varlib.patch
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
@@ -73,6 +74,7 @@
 %setup -q  
 %patch1 -p1 -b .nettype
 %patch2 -p1 -b .rhrules
+%patch3 -p1 -b .varlib
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
 %patch102 -p1 -b .slink
@@ -265,15 +267,24 @@
 	pid=$(/sbin/pidof -c udevd)
 	if [ -n "$pid" ]; then
 		kill $pid
-		/sbin/udevd -d
 	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
-	[ -f "/etc/udev/rules.d/$i" ] && ( mv /etc/udev/rules.d/$i /var/lib/udev/rules.d  >/dev/null 2>&1 )
+	[ -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
 
-/sbin/chkconfig --del udev-post >/dev/null 2>&1 || :
+if [ "$1" -ge "1" ]; then
+	/sbin/udevd -d
+	/sbin/chkconfig --del udev-post >/dev/null 2>&1 || :
+fi
+
 /sbin/chkconfig --add udev-post
 exit 0
 
@@ -392,6 +403,14 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-7
+- files from /var/lib/udev/rules.d are copied to /dev/.udev/rules.d 
+  at startup and back at shutdown
+- persistent cd and net rules generate the files in 
+  /dev/.udev/rules.d now
+- added post section to symlink 70-persistent-cd.rules 70-persistent-net.rules
+  from /etc/udev/rules.d to /dev/.udev/rules.d
+
 * Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-6
 - moved all generated files to /var/lib/udev 
   (also 70-persistent-cd.rules 70-persistent-net.rules)