From de1b7e9f71704b538b5e3b2454681cdadb7a0513 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Wed, 5 Nov 2008 14:28:53 -0800
Subject: Fix for bug http://bugzilla.vyatta.com/show_bug.cgi?id=2426

---
 scripts/vyatta_net_name | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts/vyatta_net_name')

diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name
index ff8b9bf5..54f91f04 100755
--- a/scripts/vyatta_net_name
+++ b/scripts/vyatta_net_name
@@ -78,12 +78,14 @@ declare -a cfg_net_hwid=( $( sed -ne '
     /^interfaces {/,/^}/ {
 	/^ *ethernet eth[0-9]* {/,/^    $/ {
 	    /^ *ethernet/ {
+		s/\r//
 		s/.* eth\([0-9]\+\) {$/ eth\1=/
 # hold interface name
 		h
 	    }
 	    /^.*hw-id:\?/ {
 # translate field name
+		s/\r//
 		s/.*hw-id:\? *//
 # tolower hex mac address
 		y/ABCDEF/abcdef/
-- 
cgit v1.2.3