From 8619e721c4b62085a8fa83c4284b0d87d477d453 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Sun, 16 Jan 2011 22:58:22 -0800
Subject: Bugfix 6156: Policy must be given on command line.

In the new version of biosdevname (version 0.3.4), the default policy
generates interface names of the form "em1".  That's not the naming
convention that we use.  The "all_ethN" policy does use the traditional
ethernet naming convention.
(cherry picked from commit f05a91c02e27bb19717ddf8e1ffc07ed7b1bbbc5)
---
 scripts/vyatta_net_name | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name
index d34624ae..43bed36d 100755
--- a/scripts/vyatta_net_name
+++ b/scripts/vyatta_net_name
@@ -82,7 +82,7 @@ sub biosdevname {
 
     # biosdevname renames wlanX to ethX ??
     if ($ifname =~ /^eth/) {
-	my $biosname = `/sbin/biosdevname -i $ifname`;
+	my $biosname = `/sbin/biosdevname --policy all_ethN -i $ifname`;
 	chomp $biosname;
 
 	return $biosname if ($biosname ne '');
-- 
cgit v1.2.3