75-persistent-net-generator.rules: Adjust Ravello interfaces

They don't violate the assignment schema, they should just not be persistent.
Thanks to Boris Figovsky.

Closes: #747475
LP: #1317776

diff --git a/debian/changelog b/debian/changelog
index 5ed80b562bd0364cb5deadcfa30e81a6a8bcc4b0..ac527606cef3a86987cbeb21726f80b4de32f2ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ systemd (208-7) UNRELEASED; urgency=medium
   * Fix /dev/cdrom symlink to appear for all types of drives, not just for
     pure CD-ROM ones. Also, fix the symlinks to stay after change events.
     (LP: #1323777)
+  * 75-persistent-net-generator.rules: Adjust Ravello interfaces; they don't
+    violate the assignment schema, they should just not be persistent.
+    Thanks to Boris Figovsky. (Closes: #747475, LP: #1317776)
 
  -- Michael Biebl <biebl@debian.org>  Thu, 17 Jul 2014 00:48:14 +0200
 

diff --git a/debian/extra/rules/75-persistent-net-generator.rules b/debian/extra/rules/75-persistent-net-generator.rules
index 410d4330059aa9c449af618ff056c8cd5085363f..c2c412b6235c60fa4241189c91b208cec3b1bc7e 100644 (file)
--- a/debian/extra/rules/75-persistent-net-generator.rules
+++ b/debian/extra/rules/75-persistent-net-generator.rules
@@ -67,8 +67,6 @@ ENV{MATCHADDR}=="52:54:4c:*", GOTO="globally_administered_whitelist"
 ENV{MATCHADDR}=="52:54:ab:*", GOTO="globally_administered_whitelist"
 # Kingston Technologies
 ENV{MATCHADDR}=="e2:0c:0f:*", GOTO="globally_administered_whitelist"
-# Ravello Systems
-ENV{MATCHADDR}=="2c:c2:60:*", GOTO="globally_administered_whitelist"
 
 
 # ignore interfaces with locally administered or null MAC addresses
@@ -97,6 +95,9 @@ ENV{MATCHADDR}=="7c:1e:52:*", ENV{MATCHADDR}=""
 ENV{MATCHADDR}=="7c:Ed:8d:*", ENV{MATCHADDR}=""
 ENV{MATCHADDR}=="Dc:B4:c4:*", ENV{MATCHADDR}=""
 
+# ignore Ravello virtual interfaces
+ENV{MATCHADDR}=="2c:c2:60:*", ENV{MATCHADDR}=""
+
 LABEL="globally_administered_whitelist"
 
 # ibmveth interfaces have stable locally administered MAC addresses