summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2011-01-16 22:58:22 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-01-20 15:07:56 -0800
commit0bd24a5ea89f46bf12eaa9af4de2cdc0109091e4 (patch)
treec31160ed121987209fbd46f222d2c976388e85fd
parent77eb46f798988cdfb72f6e3f9a9c248615d964e7 (diff)
downloadvyatta-cfg-quagga-0bd24a5ea89f46bf12eaa9af4de2cdc0109091e4.tar.gz
vyatta-cfg-quagga-0bd24a5ea89f46bf12eaa9af4de2cdc0109091e4.zip
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)
-rwxr-xr-xscripts/vyatta_net_name2
1 files changed, 1 insertions, 1 deletions
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 '');