rpms/udev/F-9 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch, NONE, 1.1 udev.spec, 1.243, 1.244

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25631

Modified Files:
	udev.spec 
Added Files:
	0006-rules_generator-net-rules-always-add-KERNEL-mat.patch 
Log Message:
* Mon Apr 21 2008 Harald Hoyer <harald at redhat.com> 120-4.20080421git
- rules_generator: net rules - always add KERNEL== match to generated rules
- Resolves: rhbz#440568


0006-rules_generator-net-rules-always-add-KERNEL-mat.patch:

--- NEW FILE 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch ---
>From e6d70ed63a03f39de148e6b0afb47cbbc5ec78eb Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 15 Apr 2008 00:21:51 +0200
Subject: [PATCH] rules_generator: net rules - always add KERNEL== match to generated rules

---
 .../75-persistent-net-generator.rules              |    2 +-
 extras/rule_generator/write_net_rules              |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index 2aa3076..85a4c5b 100644
--- a/extras/rule_generator/75-persistent-net-generator.rules
+++ b/extras/rule_generator/75-persistent-net-generator.rules
@@ -18,7 +18,7 @@ SUBSYSTEM!="net", GOTO="persistent_net_generator_end"
 NAME=="?*", GOTO="persistent_net_generator_end"
 
 # device name whitelist
-KERNEL!="eth*|ath*|wlan*[0-9]|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
+KERNEL!="eth*|ath*|wlan*[0-9]|msh*|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
 
 # ignore Xen virtual interfaces
 SUBSYSTEMS=="xen", GOTO="persistent_net_generator_end"
diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index 765e56f..322398b 100644
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -92,6 +92,9 @@ if [ -z "$match" ]; then
 	exit 1
 fi
 
+basename=${INTERFACE%%[0-9]*}
+match="$match, KERNEL==\"$basename*\""
+
 if [ "$INTERFACE_NAME" ]; then
 	# external tools may request a custom name
 	COMMENT="$COMMENT (custom name provided by external tool)"
@@ -101,8 +104,6 @@ if [ "$INTERFACE_NAME" ]; then
 	fi
 else
 	# if a rule using the current name already exists, find a new name
-	basename=${INTERFACE%%[0-9]*}
-	match="$match, KERNEL==\"$basename*\""
 	if interface_name_taken; then
 		INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
 		echo "INTERFACE_NEW=$INTERFACE"
-- 
1.5.4.5



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-9/udev.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- udev.spec	11 Apr 2008 14:21:50 -0000	1.243
+++ udev.spec	23 Apr 2008 15:41:04 -0000	1.244
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 120
-Release: 3%{?dist}
+Release: 4.20080421git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,11 +19,12 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
-Patch1: udev-116-nettype.patch
-Patch4: udev-118-sysconf.patch
+Patch6: 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch
 
-Patch100: udev-089-nopie.patch
-Patch101: udev-091-lib64.patch
+Patch101: udev-116-nettype.patch
+Patch102: udev-118-sysconf.patch
+Patch103: udev-089-nopie.patch
+Patch104: udev-091-lib64.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -74,11 +75,14 @@
 
 %prep
 %setup -q  
-%patch1 -p1 -b .nettype
-%patch4 -p1 -b .sysconf
 
-%patch100 -p1 -b .nopie
-%patch101 -p1 -b .lib64
+%patch6 -p1 -b .git6
+
+%patch101 -p1 -b .nettype
+%patch102 -p1 -b .sysconf
+
+%patch103 -p1 -b .nopie
+%patch104 -p1 -b .lib64
 
 %build
 
@@ -394,6 +398,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Mon Apr 21 2008 Harald Hoyer <harald at redhat.com> 120-4.20080421git
+- rules_generator: net rules - always add KERNEL== match to generated rules
+- Resolves: rhbz#440568
+
 * Fri Apr 11 2008 Harald Hoyer <harald at redhat.com> 120-3
 - fixed pre/preun scriptlets (bug #441941)
 - removed fedora specific patch for selinux symlink handling