rpms/udev/devel udev-116-nettype.patch, NONE, 1.1 udev.spec, 1.226, 1.227

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	udev.spec 
Added Files:
	udev-116-nettype.patch 
Log Message:
* Thu Oct 18 2007 Harald Hoyer <harald at redhat.com> 116-3
- fixed preun chkconfig
- added /sbin path to chkconfig in post section 
- patch: do not generate net rules for type > 256
- fixes glitches appearing in bz#323991


udev-116-nettype.patch:

--- NEW FILE udev-116-nettype.patch ---
diff -up udev-116/extras/rule_generator/write_net_rules.nettype udev-116/extras/rule_generator/write_net_rules
--- udev-116/extras/rule_generator/write_net_rules.nettype	2007-10-18 21:16:28.000000000 +0200
+++ udev-116/extras/rule_generator/write_net_rules	2007-10-18 21:20:55.000000000 +0200
@@ -23,6 +23,10 @@
 
 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
 
+if [ "$MATCHIFTYPE" ]; then
+	[ $[MATCHIFTYPE] -gt 256 ] && return 0
+fi
+
 . /lib/udev/rule_generator.functions
 
 interface_name_taken() {


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- udev.spec	16 Oct 2007 15:52:09 -0000	1.226
+++ udev.spec	18 Oct 2007 19:50:31 -0000	1.227
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 116
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,13 +18,15 @@
 Source3: udev-post.init
 Source4: fw_unit_symlinks.sh
 
+Patch1: udev-116-nettype.patch
+
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(pre): /bin/sh fileutils
+Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
 Requires(pre): MAKEDEV >= 0:3.11
 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
 BuildRequires: pam-devel glib2-devel bison
@@ -67,6 +69,7 @@
 
 %prep
 %setup -q  
+%patch1 -p1 -b .nettype
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
 
@@ -228,7 +231,7 @@
 install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
 
 %preun
-if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
+if [ "$1" = 0 -a -f %{_initrddir}/udev ]; then
 	if [ -x /sbin/pidof ]; then
 		pid=$(/sbin/pidof -c udevd)
 		if [ -n "$pid" ]; then
@@ -237,7 +240,9 @@
 	fi
 	/sbin/chkconfig --del udev
 fi
-/sbin/chkconfig --del udev-post
+if [ "$1" = 0 ]; then
+	/sbin/chkconfig --del udev-post
+fi
 exit 0
 
 %post
@@ -248,7 +253,7 @@
 		/sbin/udevd -d
 	fi
 fi
-chkconfig --add udev-post
+/sbin/chkconfig --add udev-post
 exit 0
 
 %triggerpostun -- dev <= 0:3.12-1
@@ -356,6 +361,12 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Oct 18 2007 Harald Hoyer <harald at redhat.com> 116-3
+- fixed preun chkconfig
+- added /sbin path to chkconfig in post section 
+- patch: do not generate net rules for type > 256
+- fixes glitches appearing in bz#323991
+
 * Tue Oct 16 2007 Dennis Gilmore <dennis at ausil.us> 116-2
 - sparc64 requires -fPIE not -fpie